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

5 files changed, 13 insertions, 13 deletions

diff --git a/server/main.c b/server/main.c
index e0bc3b6d0e..3126402ff1 100644
--- a/server/main.c
+++ b/server/main.c
@@ -156,8 +156,8 @@ static void show_compile_settings(void)
 	printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
 #endif
 #endif
-#ifdef AP_CHARSET_EBCDIC
-    printf(" -D AP_CHARSET_EBCDIC\n");
+#if APR_CHARSET_EBCDIC
+    printf(" -D APR_CHARSET_EBCDIC\n");
 #endif
 #ifdef APACHE_XLATE
     printf(" -D APACHE_XLATE\n");
@@ -308,7 +308,7 @@ int main(int argc, const char * const argv[])
     pconf = process->pconf;
     ap_server_argv0 = process->short_name;
 
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
     if (ap_init_ebcdic(pglobal) != APR_SUCCESS) {
         destroy_and_exit_process(process, 1);
     }
diff --git a/server/util.c b/server/util.c
index 6947b35f79..16bedc588b 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1495,11 +1495,11 @@ static char x2c(const char *what)
 {
     register char digit;
 
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
     digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
     digit *= 16;
     digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
     char xstr[5];
     xstr[0]='0';
     xstr[1]='x';
@@ -1507,7 +1507,7 @@ static char x2c(const char *what)
     xstr[3]=what[1];
     xstr[4]='\0';
     digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16));
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
     return (digit);
 }
 
@@ -1583,9 +1583,9 @@ static const char c2x_table[] = "0123456789abcdef";
 
 static apr_inline unsigned char *c2x(unsigned what, unsigned char *where)
 {
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
     what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
     *where++ = '%';
     *where++ = c2x_table[what >> 4];
     *where++ = c2x_table[what & 0xf];
diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c
index 0089b4e88b..c83719e64e 100644
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -58,7 +58,7 @@
 
 #include "ap_config.h"
 
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
 
 #include "apr_strings.h"
 #include "httpd.h"
@@ -141,4 +141,4 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len)
                           buffer, &outbytes_left);
 }
 
-#endif /* AP_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
diff --git a/server/util_md5.c b/server/util_md5.c
index 211997d255..c6b130cd18 100644
--- a/server/util_md5.c
+++ b/server/util_md5.c
@@ -105,7 +105,7 @@ AP_DECLARE(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int le
      */
 
     apr_MD5Init(&my_md5);
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
     apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
 #endif
     apr_MD5Update(&my_md5, buf, (unsigned int)length);
diff --git a/server/util_script.c b/server/util_script.c
index 2ad5a54f54..69ad9cbbf5 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -462,7 +462,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
 
 	/* if we see a bogus header don't ignore it. Shout and scream */
 
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
 	    /* Chances are that we received an ASCII header text instead of
 	     * the expected EBCDIC header lines. Try to auto-detect:
 	     */
@@ -487,7 +487,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
                                       w, &inbytes_left, w, &outbytes_left);
 	    }
 	}
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
 	if (!(l = strchr(w, ':'))) {
 	    char malformed[(sizeof MALFORMED_MESSAGE) + 1
 			   + MALFORMED_HEADER_LENGTH_TO_SHOW];