Remove all references to CORE_PRIVATE.

pquerna · pquerna · commit 30906d7cabc6 · 2008-04-07T10:45:43.000Z
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/build-modules-c.awk b/build/build-modules-c.awk
@@ -33,7 +33,6 @@ END {
     print ""
     print "#include \"ap_config.h\""
     print "#include \"httpd.h\""
-    print "#define CORE_PRIVATE"
     print "#include \"http_config.h\""
     print ""
     for (i = 0; i < pn; ++i) {
diff --git a/build/make_exports.awk b/build/make_exports.awk
@@ -23,8 +23,6 @@ BEGIN {
     printf(" * uses them.\n")
     printf(" */\n")
     printf("\n")
-    printf("#define CORE_PRIVATE\n")
-    printf("\n")
     
     for (i = 1; i < ARGC; i++) {
         file = ARGV[i]
diff --git a/build/prebuildNW.bat b/build/prebuildNW.bat
@@ -37,7 +37,7 @@ copy ..\srclib\pcre\pcre.hw ..\srclib\pcre\pcre.h
 
 @echo Generating the import lists...
 set MWCIncludes=..\include;..\modules\http;..\modules\aaa;..\os\netware;..\server\mpm\netware;..\srclib\apr\include;..\srclib\apr-util\include;+%NovellLibC%
-mwccnlm -P nw_export.inc -d NETWARE -d CORE_PRIVATE -EP
+mwccnlm -P nw_export.inc -d NETWARE -EP
 awk -f make_nw_export.awk nw_export.i |sort >..\os\netware\httpd.imp
 
 rem cd ..\srclib\apr\build
diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
@@ -27,7 +27,6 @@
 #define APR_WANT_BYTEFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
@@ -29,7 +29,6 @@
 #define APR_WANT_BYTEFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_cache.h"
 
 extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_cache.h"
 
 #include <ap_provider.h>
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_cache.h"
 
 module AP_MODULE_DECLARE_DATA cache_module;
diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
@@ -26,8 +26,6 @@
 #ifndef MOD_CACHE_H
 #define MOD_CACHE_H 
 
-#define CORE_PRIVATE
-
 #include "apr_hooks.h"
 #include "apr.h"
 #include "apr_lib.h"
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
@@ -86,8 +86,6 @@
 #include <sys/types.h>
 #endif
 
-#define CORE_PRIVATE
-
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
@@ -35,7 +35,6 @@
  * of 0 means the object is not in the cache and no worker threads are accessing
  * it.
  */
-#define CORE_PRIVATE
 #include "mod_cache.h"
 #include "cache_pqueue.h"
 #include "cache_cache.h"
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "ap_mmn.h"
 #include "httpd.h"
diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
@@ -26,7 +26,7 @@
 
 #include "httpd.h"
 #include "http_config.h"
-#define CORE_PRIVATE
+
 #include "http_core.h"
 #include "http_log.h"
 #include "http_main.h"
diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c
@@ -22,7 +22,7 @@
 #include "http_config.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#define CORE_PRIVATE
+
 #include "http_core.h"
 #include "apr_buckets.h"
 #include "util_filter.h"
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
@@ -39,8 +39,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
-
 #include "util_filter.h"
 #include "ap_config.h"
 #include "httpd.h"
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
@@ -49,8 +49,6 @@
 #include <sys/types.h>
 #endif
 
-#define CORE_PRIVATE
-
 #include "util_filter.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
@@ -47,8 +47,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
-
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
@@ -54,7 +54,6 @@
  *          [Jim J.]
  */
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
diff --git a/modules/generators/mod_suexec.c b/modules/generators/mod_suexec.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
@@ -29,7 +29,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "util_filter.h"
 #include "ap_config.h"
 #include "httpd.h"
diff --git a/modules/http/chunk_filter.c b/modules/http/chunk_filter.c
@@ -24,7 +24,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_connection.h"
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
@@ -20,7 +20,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_connection.h"
diff --git a/modules/http/http_etag.c b/modules/http/http_etag.c
@@ -20,7 +20,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_connection.h"
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
@@ -29,7 +29,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "util_filter.h"
 #include "ap_config.h"
 #include "httpd.h"
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
@@ -32,7 +32,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "util_filter.h"
 #include "ap_config.h"
 #include "httpd.h"
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
@@ -31,7 +31,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
@@ -88,7 +88,6 @@
 #include "apr_strings.h"
 #include "apr_errno.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_proxy.h"
 #include "mod_core.h"
 #include "apr_optional.h"
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
@@ -42,8 +42,6 @@
 
  */
 
-#define CORE_PRIVATE
-
 #include "apr_hooks.h"
 #include "apr.h"
 #include "apr_lib.h"
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
@@ -16,8 +16,6 @@
 
 /* Load balancer module for Apache proxy */
 
-#define CORE_PRIVATE
-
 #include "mod_proxy.h"
 #include "scoreboard.h"
 #include "ap_mpm.h"
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
@@ -16,8 +16,6 @@
 
 /* CONNECT method for Apache proxy */
 
-#define CORE_PRIVATE
-
 #include "mod_proxy.h"
 #include "apr_poll.h"
 
diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_session.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/modules/session/mod_session.h b/modules/session/mod_session.h
@@ -26,8 +26,6 @@
  * @{
  */
 
-#define CORE_PRIVATE
-
 #include "apr_hooks.h"
 #include "apr_optional.h"
 #include "apr_tables.h"
diff --git a/modules/session/mod_session_cookie.c b/modules/session/mod_session_cookie.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_session.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_session.h"
 #include "apu_version.h"
 #include "apr_base64.h"                /* for apr_base64_decode et al */
diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CORE_PRIVATE
-
 #include "mod_session.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
diff --git a/os/netware/modules.c b/os/netware/modules.c
@@ -19,7 +19,7 @@
  * the core server
  */
 
-#define CORE_PRIVATE
+
 #include "httpd.h"
 #include "http_config.h"
 
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
@@ -15,7 +15,6 @@
  */
 
 #include "ap_config.h"
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_main.h"
diff --git a/os/win32/modules.c b/os/win32/modules.c
@@ -19,7 +19,6 @@
  * the core server
  */
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 
diff --git a/server/config.c b/server/config.c
@@ -39,8 +39,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
-
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/server/connection.c b/server/connection.c
@@ -17,7 +17,6 @@
 #include "apr.h"
 #include "apr_strings.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_connection.h"
diff --git a/server/core.c b/server/core.c
@@ -27,7 +27,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/server/core_filters.c b/server/core_filters.c
@@ -32,7 +32,6 @@
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/server/listen.c b/server/listen.c
@@ -20,7 +20,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/server/log.c b/server/log.c
@@ -40,8 +40,6 @@
 #include <unistd.h>
 #endif
 
-#define CORE_PRIVATE
-
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
diff --git a/server/main.c b/server/main.c
@@ -28,7 +28,6 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_main.h"
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c
diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
diff --git a/server/protocol.c b/server/protocol.c
diff --git a/server/request.c b/server/request.c
diff --git a/server/util.c b/server/util.c
diff --git a/server/util_cfgtree.c b/server/util_cfgtree.c
diff --git a/server/util_cookies.c b/server/util_cookies.c
diff --git a/server/util_mutex.c b/server/util_mutex.c
diff --git a/server/util_script.c b/server/util_script.c
diff --git a/server/vhost.c b/server/vhost.c
