From: Ryan Bloom <rbb@apache.org>
Date: Tue, 19 Dec 2000 17:05:48 +0000 (+0000)
Subject: Force all Apache functions to be linked into the executable, whether they
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53be78154d25a8048bc41cc668417095815744d7;p=apache

Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


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

diff --git a/CHANGES b/CHANGES
index f745427ba3..00c48b2d04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 Changes with Apache 2.0b1
+  *) Get the functions in server/linked into the server, regardless of
+     which modules linked into the server.  This uses the same hack 
+     for Apache that we use for APR and apr-util to ensure all of the
+     necessary functions are linked.  As a part of thise, the CHARSET_EBCIDC
+     was renamed to AP_CHARSET_EBCDIC for namespace protection, and to make
+     the scripts a bit easier.
+     [Ryan Bloom]
 
   *) Rework the RFC1413 handling to make it thread-safe, use a timeout
      on the query, and remove IPv4 dependencies.  [Jeff Trawick]
diff --git a/Makefile.in b/Makefile.in
index d7438578fd..dfa123b9b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ PROGRAM_DEPENDENCIES = \
   $(AP_LIBS)
 
 PROGRAMS        = $(PROGRAM_NAME)
-targets         = $(PROGRAMS)
+targets         = $(PROGRAMS) 
 phony_targets   = $(srcdir)/buildmark.c
 install_targets = install-conf install-htdocs install-icons install-other \
 	install-cgi install-include install-support
diff --git a/acinclude.m4 b/acinclude.m4
index f08f174683..2391b5de50 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -66,6 +66,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(sysconfdir)
   APACHE_SUBST(progname)
   APACHE_SUBST(prefix)
+  APACHE_SUBST(AWK)
   APACHE_SUBST(CC)
   APACHE_SUBST(CFLAGS)
   APACHE_SUBST(CPPFLAGS)
@@ -216,7 +217,7 @@ int main(void) {
   ac_cv_ebcdic="no"
 ])])
   if test "$ac_cv_ebcdic" = "yes"; then
-    AC_DEFINE(CHARSET_EBCDIC,, [Define if system uses EBCDIC])
+    AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])
   fi
 ])
 
diff --git a/build/buildexports.awk b/build/buildexports.awk
index 78f373065f..d0d692fe35 100644
--- a/build/buildexports.awk
+++ b/build/buildexports.awk
@@ -1,3 +1,3 @@
-/^APR_/     { print "#if", $1 }
+/^(APR?_|defined)/     { print "#if", $1 }
 /^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" }
-/^\/APR_/   { print "#endif /*", substr($1,2), "*/" }
+/^\/(APR?_|defined)/   { print "#endif /*", substr($1,2), "*/" }
diff --git a/build/buildexports.sh b/build/buildexports.sh
index b1ac43ccd5..38ffbd66b1 100755
--- a/build/buildexports.sh
+++ b/build/buildexports.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 if test -z "$1"; then
-    echo "USAGE: $0 SRCLIB-DIRECTORY"
+    echo "USAGE: $0 HTTPD-DIRECTORY"
     echo ""
-    echo "for example: $0 ../srclib"
+    echo "for example: $0 .."
     exit 1
 fi
 
@@ -12,9 +12,10 @@ echo " * link all of the APR functions into server regardless of whether"
 echo " * the base server uses them."
 echo " */"
 echo ""
+echo "#define CORE_PRIVATE"
 
 cur_dir="`pwd`"
-for dir in $1/apr/include $1/apr-util/include
+for dir in $1/srclib/apr/include $1/srclib/apr-util/include $1/include
 do
     cd $dir
     for file in *.h; do
diff --git a/include/ap_config.h b/include/ap_config.h
index e5f4e0ad7e..5c458ba070 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -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(CHARSET_EBCDIC) && !defined(APACHE_XLATE)
+#if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)
 #define APACHE_XLATE
 #endif
 
diff --git a/include/ap_listen.h b/include/ap_listen.h
index 8beee07aa8..e723224a54 100644
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -56,6 +56,7 @@
 #define AP_LISTEN_H
 
 #include "apr_network_io.h"
+#include "httpd.h"
 #include "http_config.h"
 
 /**
@@ -114,7 +115,10 @@ void ap_listen_pre_config(void);
  * Prefork or SPMT_OS2 MPMs.
  */ 
 int ap_setup_listeners(server_rec *s);
-#else
+#endif
+/* Split into two #if's to make the exports scripts easier.
+ */
+#if defined(WIN32) || defined(SPMT_OS2_MPM)
 /**
  * Create and open a socket on the specified port.  This includes listening
  * and binding the socket.
diff --git a/include/http_config.h b/include/http_config.h
index de322b4573..a977776b0e 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -447,6 +447,7 @@ struct module_struct {
 				NULL, \
 				MODULE_MAGIC_COOKIE
 
+#if AP_RBB_HACK
 /**
  * Generic accessors for other modules to get at their own module-specific
  * data
@@ -457,6 +458,8 @@ struct module_struct {
  * @deffunc void *ap_get_module_config(void *conf_vector, module *m)
  */
 AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m);
+#endif
+#if AP_RBB_HACK
 /**
  * Generic accessors for other modules to set at their own module-specific
  * data
@@ -467,6 +470,7 @@ AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m);
  * @deffunc void ap_set_module_config(void *conf_vector, module *m, void *val)
  */
 AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val);
+#endif
 
 #define ap_get_module_config(v,m)	\
     (((void **)(v))[(m)->module_index])
diff --git a/include/httpd.h b/include/httpd.h
index 62f9cd7ed2..46ed224ddf 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -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 CHARSET_EBCDIC
+#ifndef AP_CHARSET_EBCDIC
 #define LF 10
 #define CR 13
 #define CRLF "\015\012"
-#else /* CHARSET_EBCDIC */
+#else /* AP_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 /* CHARSET_EBCDIC */                                   
+#endif /* AP_CHARSET_EBCDIC */                                   
 
 /* Possible values for request_rec.read_body (set by handling module):
  *    REQUEST_NO_BODY          Send 413 error if message has any body
diff --git a/include/util_ebcdic.h b/include/util_ebcdic.h
index 9799823790..149784069f 100644
--- a/include/util_ebcdic.h
+++ b/include/util_ebcdic.h
@@ -59,7 +59,6 @@
 #ifndef APACHE_UTIL_EBCDIC_H
 #define APACHE_UTIL_EBCDIC_H
 
-#ifdef CHARSET_EBCDIC
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,6 +72,8 @@ extern "C" {
  * @package Utilities for EBCDIC conversion
  */
 
+#ifdef AP_CHARSET_EBCDIC
+
 /**
  * Setup all of the global translation handlers
  * @param pool pool to allocate out of
@@ -99,11 +100,11 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len);
 }
 #endif
 
-#else   /* CHARSET_EBCDIC */
+#else   /* AP_CHARSET_EBCDIC */
 
 #define ap_xlate_proto_to_ascii(x,y)          /* NOOP */
 #define ap_xlate_proto_from_ascii(x,y)        /* NOOP */
 
-#endif  /* CHARSET_EBCDIC */
+#endif  /* AP_CHARSET_EBCDIC */
     
 #endif  /* !APACHE_UTIL_EBCDIC_H */
diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index c9e7b02878..999704463b 100644
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -291,7 +291,7 @@ static int find_code_page(request_rec *r)
  */
              
     if (strncasecmp(mime_type, "text/", 5) &&
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
         /* On an EBCDIC machine, be willing to translate mod_autoindex-
          * generated output.  Otherwise, it doesn't look too cool.
          *
diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h
index 32db22b171..8777cf73bd 100644
--- a/modules/filters/mod_include.h
+++ b/modules/filters/mod_include.h
@@ -69,11 +69,11 @@
 #define SIZEFMT_BYTES 0
 #define SIZEFMT_KMG 1
 #define TMP_BUF_SIZE 1024
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 #define RAW_ASCII_CHAR(ch)  apr_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch)
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
 #define RAW_ASCII_CHAR(ch)  (ch)
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 
 module AP_MODULE_DECLARE_DATA includes_module;
 
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 9ab5296f60..afc6e9c44b 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -142,11 +142,11 @@ enum enctype {
 #define HDR_APP (0)		/* append header, for proxy_add_header() */
 #define HDR_REP (1)		/* replace header, for proxy_add_header() */
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 #define CRLF   "\r\n"
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
 #define CRLF   "\015\012"
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 
 #define	DEFAULT_FTP_DATA_PORT	20
 #define	DEFAULT_FTP_PORT	21
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index a2f45fa6e1..2bf43ed185 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -110,11 +110,11 @@ static int ftp_check_string(const char *x)
 	    ch = ap_proxy_hex2c(&x[i + 1]);
 	    i += 2;
 	}
-#ifndef CHARSET_EBCDIC
+#ifndef AP_CHARSET_EBCDIC
         if (ch == '\015' || ch == '\012' || (ch & 0x80))
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
         if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80))
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
         return 0;
     }
     return 1;
@@ -602,9 +602,9 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url)
     ap_bpush_socket(f, sock);
 /* shouldn't we implement telnet control options here? */
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 
 /* possible results: */
     /* 120 Service ready in nnn minutes. */
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 1cb27a03d3..af097f853a 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -78,7 +78,7 @@ int ap_proxy_hex2c(const char *x)
 {
     int i, ch;
 
-#ifndef CHARSET_EBCDIC
+#ifndef AP_CHARSET_EBCDIC
     ch = x[0];
     if (apr_isdigit(ch))
 	i = ch - '0';
@@ -96,14 +96,14 @@ int ap_proxy_hex2c(const char *x)
     else
 	i += ch - ('a' - 10);
     return i;
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
     return (1 == sscanf(x, "%2x", &i)) ? os_toebcdic[i&0xFF] : 0;
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 }
 
 void ap_proxy_c2hex(int ch, char *x)
 {
-#ifndef CHARSET_EBCDIC
+#ifndef AP_CHARSET_EBCDIC
     int i;
 
     x[0] = '%';
@@ -118,14 +118,14 @@ void ap_proxy_c2hex(int ch, char *x)
 	x[2] = ('A' - 10) + i;
     else
 	x[2] = '0' + i;
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
     static const char ntoa[] = { "0123456789ABCDEF" };
     ch &= 0xFF;
     x[0] = '%';
     x[1] = ntoa[(os_toascii[ch]>>4)&0x0F];
     x[2] = ntoa[os_toascii[ch]&0x0F];
     x[3] = '\0';
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 }
 
 /*
@@ -480,7 +480,7 @@ long int ap_proxy_send_fb(proxy_completion *completion, BUFF *f, request_rec *r,
     if (c) ap_cache_el_data(c, &cachefp);
 
 #if 0
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     /* The cache copy is ASCII, not EBCDIC, even for text/html) */
     ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0);
     if (c != NULL && c->fp != NULL)
diff --git a/os/bs2000/ebcdic.c b/os/bs2000/ebcdic.c
index 70b6f15014..879b35050d 100644
--- a/os/bs2000/ebcdic.c
+++ b/os/bs2000/ebcdic.c
@@ -56,7 +56,7 @@
  * University of Illinois, Urbana-Champaign.
  */
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 #include "ap_config.h"
 #include "ebcdic.h"
 /*
@@ -249,4 +249,4 @@ ascii2ebcdic(unsigned char *dest, const unsigned char *srce, size_t count)
 		*dest++ = os_toebcdic[*srce++];
 	}
 }
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
diff --git a/os/tpf/ebcdic.c b/os/tpf/ebcdic.c
index c266f644a2..0d44053a8a 100644
--- a/os/tpf/ebcdic.c
+++ b/os/tpf/ebcdic.c
@@ -56,7 +56,7 @@
  * University of Illinois, Urbana-Champaign.
  */
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 #include "ap_config.h"
 #include "ebcdic.h"
 /*
@@ -217,5 +217,5 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
                 *udest++ = os_toebcdic[*usrce++];
     }
 }
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
  
diff --git a/server/Makefile.in b/server/Makefile.in
index 77cda7dc3e..f5857a864b 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,8 +1,9 @@
 
-CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
+CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h apache.exports
 
 SUBDIRS = mpm
 
+TARGET_EXPORTS    = apache.exports
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
     uri_delims.h test_char.h \
@@ -31,7 +32,21 @@ test_char.h: gen_test_char
 util_uri.lo: uri_delims.h
 util.lo: test_char.h
 
-EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports
+EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports apache.exports
 
-exports.c: $(EXPORT_FILES)
-	(cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
+delete-exports:
+	@if test -f $(TARGET_EXPORTS); then \
+		    headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
+		    if test -n "$$headers"; then \
+		        echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
+		        echo $(RM) -f $(TARGET_EXPORTS) ; \
+		        $(RM) -f $(TARGET_EXPORTS) ; \
+		    fi \
+	fi
+
+
+$(TARGET_EXPORTS):
+	$(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@ ; \
+
+exports.c: delete-exports $(EXPORT_FILES)
+	(cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@
diff --git a/server/main.c b/server/main.c
index 58d2cfd175..e0bc3b6d0e 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 CHARSET_EBCDIC
-    printf(" -D CHARSET_EBCDIC\n");
+#ifdef AP_CHARSET_EBCDIC
+    printf(" -D AP_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 CHARSET_EBCDIC
+#ifdef AP_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 a9fc058a1d..6947b35f79 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1495,11 +1495,11 @@ static char x2c(const char *what)
 {
     register char digit;
 
-#ifndef CHARSET_EBCDIC
+#ifndef AP_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 /*CHARSET_EBCDIC*/
+#else /*AP_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 /*CHARSET_EBCDIC*/
+#endif /*AP_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 CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_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 51830d77c2..0089b4e88b 100644
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -58,7 +58,7 @@
 
 #include "ap_config.h"
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_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 /* CHARSET_EBCDIC */
+#endif /* AP_CHARSET_EBCDIC */
diff --git a/server/util_md5.c b/server/util_md5.c
index b1957a8427..211997d255 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 CHARSET_EBCDIC
+#ifdef AP_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 786a005cc5..2ad5a54f54 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 CHARSET_EBCDIC
+#ifdef AP_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 /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 	if (!(l = strchr(w, ':'))) {
 	    char malformed[(sizeof MALFORMED_MESSAGE) + 1
 			   + MALFORMED_HEADER_LENGTH_TO_SHOW];
diff --git a/support/htdigest.c b/support/htdigest.c
index c7a179ae76..9ed7dbacf8 100644
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -93,22 +93,22 @@
 #endif
 
 #if 'A' == 0xC1
-#define CHARSET_EBCDIC
+#define AP_CHARSET_EBCDIC
 #endif
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 #define LF '\n'
 #define CR '\r'
 #else
 #define LF 10
 #define CR 13
-#endif /* CHARSET_EBCDIC */
+#endif /* AP_CHARSET_EBCDIC */
 
 #define MAX_STRING_LEN 256
 
 char *tn;
 apr_pool_t *cntxt;
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
 apr_xlate_t *to_ascii;
 #endif
 
@@ -192,7 +192,7 @@ static void add_password(char *user, char *realm, apr_file_t *f)
     sprintf(string, "%s:%s:%s", user, realm, pw);
 
     apr_MD5Init(&context);
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     apr_MD5SetXlate(&context, to_ascii);
 #endif
     apr_MD5Update(&context, (unsigned char *) string, strlen(string));
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
     atexit(apr_terminate); 
     apr_create_pool(&cntxt, NULL);
 
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
     if (rv) {
         fprintf(stderr, "apr_xlate_open(): %s (%d)\n",
diff --git a/support/htpasswd.c b/support/htpasswd.c
index 3d9bfbe913..4ef063f950 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -104,13 +104,13 @@
 #define unlink _unlink
 #endif
 
-#ifndef CHARSET_EBCDIC
+#ifndef AP_CHARSET_EBCDIC
 #define LF 10
 #define CR 13
-#else /*CHARSET_EBCDIC*/
+#else /*AP_CHARSET_EBCDIC*/
 #define LF '\n'
 #define CR '\r'
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 
 #define MAX_STRING_LEN 256
 #define ALG_PLAIN 0
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
     int noninteractive = 0;
     int i;
     int args_left = 2;
-#ifdef CHARSET_EBCDIC
+#ifdef AP_CHARSET_EBCDIC
     apr_pool_t *pool;
     apr_status_t rv;
     apr_xlate_t *to_ascii;
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
         fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv);
         exit(1);
     }
-#endif /*CHARSET_EBCDIC*/
+#endif /*AP_CHARSET_EBCDIC*/
 
     tempfilename = NULL;
     signal(SIGINT, (void (*)(int)) interrupted);