Commit a8070678 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
parent cd2af793

acinclude.m4

+0 −18
Original line number Diff line number Diff line
@@ -203,24 +203,6 @@ AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[ 
  fi

])



AC_DEFUN(APACHE_EBCDIC,[

  AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[

  AC_TRY_RUN( [

int main(void) { 

  return (unsigned char)'A' != (unsigned char)0xC1; 

} 

],[

  ac_cv_ebcdic="yes"

],[

  ac_cv_ebcdic="no"

],[

  ac_cv_ebcdic="no"

])])

  if test "$ac_cv_ebcdic" = "yes"; then

    AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])

  fi

])



dnl APACHE_MODPATH_INIT(modpath)

AC_DEFUN(APACHE_MODPATH_INIT,[

  current_dir=$1

configure.in

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ AC_CHECK_LIB(nsl, gethostname) 
AC_CHECK_LIB(socket, socket)

AC_CHECK_LIB(resolv, sethostent)



APACHE_EBCDIC



AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],

        [OPTIM="$withval"])

include/ap_config.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline) 
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE

#endif



#if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)

#if APR_CHARSET_EBCDIC && !defined(APACHE_XLATE)

#define APACHE_XLATE

#endif

include/httpd.h

+3 −3
Original line number Diff line number Diff line
@@ -517,11 +517,11 @@ struct ap_method_list_t { 
#define DIR_MAGIC_TYPE "httpd/unix-directory"



/* Just in case your linefeed isn't the one the other end is expecting. */

#ifndef AP_CHARSET_EBCDIC

#if !APR_CHARSET_EBCDIC

#define LF 10

#define CR 13

#define CRLF "\015\012"

#else /* AP_CHARSET_EBCDIC */

#else /* APR_CHARSET_EBCDIC */

/* For platforms using the EBCDIC charset, the transition ASCII->EBCDIC is done

 * in the buff package (bread/bputs/bwrite).  Everywhere else, we use

 * "native EBCDIC" CR and NL characters. These are therefore
@@ -531,7 +531,7 @@ struct ap_method_list_t { 
#define CR '\r'

#define LF '\n'

#define CRLF "\r\n"

#endif /* AP_CHARSET_EBCDIC */                                   

#endif /* APR_CHARSET_EBCDIC */                                   



/* Possible values for request_rec.read_body (set by handling module):

 *    REQUEST_NO_BODY          Send 413 error if message has any body

include/util_ebcdic.h

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ extern "C" { 
 * @package Utilities for EBCDIC conversion

 */



#ifdef AP_CHARSET_EBCDIC

#if APR_CHARSET_EBCDIC



/**

 * Setup all of the global translation handlers
@@ -100,11 +100,11 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len); 
}

#endif



#else   /* AP_CHARSET_EBCDIC */

#else   /* APR_CHARSET_EBCDIC */



#define ap_xlate_proto_to_ascii(x,y)          /* NOOP */

#define ap_xlate_proto_from_ascii(x,y)        /* NOOP */



#endif  /* AP_CHARSET_EBCDIC */

#endif  /* APR_CHARSET_EBCDIC */

    

#endif  /* !APACHE_UTIL_EBCDIC_H */