From: Paul Querna Date: Mon, 7 Apr 2008 10:45:43 +0000 (+0000) Subject: Remove all references to CORE_PRIVATE. X-Git-Tag: 2.3.0~789 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a324a1d72f2f9c3d48bd4615b462a922760ba643;p=thirdparty%2Fapache%2Fhttpd.git Remove all references to CORE_PRIVATE. 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 index 01d0b333341..8dc4aa1c2bc 100644 --- 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 index c599058123e..1cf05684149 100644 --- 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 index 0ce59f1e660..f8f6c8864c1 100755 --- 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 index 66e204e0d07..b0c6197fc14 100644 --- 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 index 5b7c4098617..d3c4490226f 100644 --- 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 index 7b99f3eda91..f19375b9529 100644 --- 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 index ec2d749b6c7..de8f385921b 100644 --- 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 diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 0e49bf5efda..a68b78933ee 100644 --- 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 index e7c9741f82e..c58713c6c8b 100644 --- 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 index d7b5e99baea..9756cc736fb 100644 --- a/modules/cache/mod_file_cache.c +++ b/modules/cache/mod_file_cache.c @@ -86,8 +86,6 @@ #include #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 index 93439c64012..1c6d6024393 100644 --- 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 index 6c21ac6a081..63e329260b1 100644 --- 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 index a44ecc33f28..a5221aea299 100644 --- 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 index 78c9f90d5ef..cf4bd4033a6 100644 --- 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 index 4d3b0783d2b..c809fb56c75 100644 --- 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 index de7cdaf42fc..70efc49b808 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -49,8 +49,6 @@ #include #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 index 18f415b3b5b..4c8dc4a6cd9 100644 --- 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 index d2406a8b4ff..3c341b0670a 100644 --- 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 index e0c8e1932b9..bb4f93fa1ab 100644 --- 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 index a25d1e5957d..6e172a652af 100644 --- 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 index b680185b801..a8ce0d02402 100644 --- 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 index faf47b671ed..fbe4aa3db5c 100644 --- 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 index a7d3d9c0a99..9148ae475f8 100644 --- 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 index 90d30269bc6..10b2ea28171 100644 --- 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 index d50353c50f6..aa23a32fda9 100644 --- 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 index 6c967ae1523..3b17c76e549 100644 --- 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 index 44bed43b69b..37c76a75780 100644 --- 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 index 9d06abffe1b..54e8a727499 100644 --- 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 index f13456415f1..3c74570a611 100644 --- 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 index 9339d4386ad..da0e4fe5146 100644 --- 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 index 8804359c090..fdadc565e68 100644 --- 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 index b3fe3c07a51..46439925924 100644 --- 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 index 54223c2dc35..65560cd5343 100644 --- 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 index b69ef2833e5..b440f360ad9 100644 --- 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 index 38ec39f213e..845e5ae0722 100644 --- 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 index b432184576c..074afb10e46 100644 --- 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 index d125e1a2df4..4ef2fe87b89 100644 --- 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 index 96784d791e5..6f461b8709b 100644 --- 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 index 911142ad8c8..252421f78ae 100644 --- 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 index da6d6e23544..3b8a00a1116 100644 --- 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 index d4880b0b8dd..0adfb7071d8 100644 --- 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 index 92b70b619b8..3542d8abf57 100644 --- 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 index e9d3865a995..4bfd41c5a84 100644 --- 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 index d66f326ad2b..f2d78f57625 100644 --- 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 index 5c8b1a49367..a0ee668b765 100644 --- a/server/log.c +++ b/server/log.c @@ -40,8 +40,6 @@ #include #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 index 0f3e6a09fb8..b32dbc9f1f4 100644 --- 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 index 896116a8396..248be2aed95 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -31,8 +31,6 @@ * - on exit most worker threads segfault trying to access a kernel page. */ -#define CORE_PRIVATE - #include #include #include diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c index 12f7f405c44..fab5edac1a1 100644 --- a/server/mpm/experimental/event/event.c +++ b/server/mpm/experimental/event/event.c @@ -75,8 +75,6 @@ #error The Event MPM requires APR threads, but they are unavailable. #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c index abc4338faed..7bc652e7563 100644 --- a/server/mpm/experimental/leader/leader.c +++ b/server/mpm/experimental/leader/leader.c @@ -43,8 +43,6 @@ #error The Leader/Follower MPM requires APR threads, but they are unavailable. #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 668f909d706..bf0295eb8bf 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -35,8 +35,6 @@ #error The perchild MPM requires APR threads, but they are unavailable. #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c index 0ab89197f0d..938816af42e 100644 --- a/server/mpm/experimental/threadpool/threadpool.c +++ b/server/mpm/experimental/threadpool/threadpool.c @@ -51,8 +51,6 @@ #error The Worker MPM requires APR threads, but they are unavailable. #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 0759416321f..32b8e1e79d8 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -36,7 +36,6 @@ Todo list - Enforce MaxClients somehow */ -#define CORE_PRIVATE #define INCL_NOPMAPI #define INCL_DOS #define INCL_DOSERRORS diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c index bc313315129..51c85644cea 100644 --- a/server/mpm/mpmt_os2/mpmt_os2_child.c +++ b/server/mpm/mpmt_os2/mpmt_os2_child.c @@ -14,7 +14,6 @@ * limitations under the License. */ -#define CORE_PRIVATE #define INCL_NOPMAPI #define INCL_DOS #define INCL_DOSERRORS diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 42d821ecaec..421e631dea4 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -61,8 +61,6 @@ #include #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "mpm_default.h" diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 8948c43c4a9..df2c689ffe6 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -31,8 +31,6 @@ #include #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "mpm_default.h" diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index e245c86b2df..6d3430c24e1 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -16,7 +16,6 @@ #ifdef WIN32 -#define CORE_PRIVATE #include "httpd.h" #include "http_main.h" #include "http_log.h" diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 59ee8dc8def..54452b9c7a7 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -16,7 +16,6 @@ #ifdef WIN32 -#define CORE_PRIVATE #include "httpd.h" #include "http_main.h" #include "http_log.h" diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c index baa1a88bed8..c8e5d1ae554 100644 --- a/server/mpm/winnt/nt_eventlog.c +++ b/server/mpm/winnt/nt_eventlog.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CORE_PRIVATE - #include "httpd.h" #include "http_log.h" #include "mpm_winnt.h" diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index 6c5d87b48f5..96e9bede040 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -19,7 +19,6 @@ * preload the API symbols now... */ -#define CORE_PRIVATE #define _WINUSER_ #include "httpd.h" diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 65b7436c3bc..02d0f143ac9 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -50,8 +50,6 @@ #error The Worker MPM requires APR threads, but they are unavailable. #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "httpd.h" #include "http_main.h" diff --git a/server/protocol.c b/server/protocol.c index e092e474148..bab191b6bff 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -33,7 +33,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/server/request.c b/server/request.c index ec844f7af04..6602da221bb 100644 --- a/server/request.c +++ b/server/request.c @@ -32,7 +32,6 @@ #define APR_WANT_STRFUNC #include "apr_want.h" -#define CORE_PRIVATE #include "ap_config.h" #include "ap_provider.h" #include "httpd.h" diff --git a/server/util.c b/server/util.c index d052624866a..de23e514e24 100644 --- a/server/util.c +++ b/server/util.c @@ -42,8 +42,6 @@ #include /* for gethostbyname() */ #endif -#define CORE_PRIVATE - #include "ap_config.h" #include "apr_base64.h" #include "httpd.h" diff --git a/server/util_cfgtree.c b/server/util_cfgtree.c index ac284a7b21f..a7142e3d781 100644 --- a/server/util_cfgtree.c +++ b/server/util_cfgtree.c @@ -14,7 +14,6 @@ * limitations under the License. */ -#define CORE_PRIVATE #include "util_cfgtree.h" #include diff --git a/server/util_cookies.c b/server/util_cookies.c index f7f6b79b093..376afc0db31 100644 --- a/server/util_cookies.c +++ b/server/util_cookies.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CORE_PRIVATE - #include "util_cookies.h" #include "apr_lib.h" #include "apr_strings.h" diff --git a/server/util_mutex.c b/server/util_mutex.c index f1f265c644b..1ea02ccb1b9 100644 --- a/server/util_mutex.c +++ b/server/util_mutex.c @@ -27,8 +27,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/util_script.c b/server/util_script.c index c6c381e051f..e13334a1189 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -25,7 +25,6 @@ #include #endif -#define CORE_PRIVATE #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/server/vhost.c b/server/vhost.c index d7a0a07e6d4..8aebcfd023e 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -27,7 +27,6 @@ #define APR_WANT_STRFUNC #include "apr_want.h" -#define CORE_PRIVATE #include "ap_config.h" #include "httpd.h" #include "http_config.h"