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 01d0b3333414689dc449637ef83f729ebce1e704..8dc4aa1c2bca3b8c578ed16a0a20017c3ba4e3c1 100644 (file)
--- 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 c599058123eb6ac7c69f3df82ef644ecba9a2ea2..1cf05684149a2f81459587cf801a7b4e3acca1af 100644 (file)
--- 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 0ce59f1e6609191ce5cc074e4599ff01a7e435d9..f8f6c8864c1fd580347c1c91305735d8a13ad5aa 100755 (executable)
--- 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 66e204e0d07b2e4df854f9bf6cc2d0917a5d2748..b0c6197fc14a938f8da4b82e1e63d659d4de943f 100644 (file)
--- 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 5b7c40986174c61e92b298ba95582e3c4c49c4c4..d3c4490226f1bdf5370d01ff3a423ffe41e38550 100644 (file)
--- 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 7b99f3eda9132c59ad3a062c5b158a21d7b66369..f19375b9529ec848e05ecab37f467b734f4f5a5b 100644 (file)
--- 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 ec2d749b6c7d9f74476169710c816b0d25c932a2..de8f385921b41212d6f54b91470065ded0a714cb 100644 (file)
--- 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
index 0e49bf5efda43018771def031e92f5e2423feb71..a68b78933eed3bf16f61992edd2832c51726ca1b 100644 (file)
--- 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 e7c9741f82e2f9cd962a4774a59c0b85582bc167..c58713c6c8b68d6bf4b2b1f7cc71bfd3a95c6abd 100644 (file)
--- 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 d7b5e99baea53a3e22f5eb37efa34e354b9b7a45..9756cc736fbcc7fdc760c3492f90c054987ce195 100644 (file)
--- 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
index 93439c64012a5541f5a565c072ba3625997eb928..1c6d60243937daccadd8026faf696b96ff1fbbad 100644 (file)
--- 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 6c21ac6a081c1adc92482aaf3403abdcc0ecbb60..63e329260b1ba2320d54dd14f4c2a97108a72613 100644 (file)
--- 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 a44ecc33f287b0db3326517de9e81e0117212366..a5221aea299c55d952c100efc58d8b8325943e02 100644 (file)
--- 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 78c9f90d5efd2a284ad93457f927b0b7b437c128..cf4bd4033a65e665bf21aa3cdde269bd09ecf8bd 100644 (file)
--- 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 4d3b0783d2beff9cc0a38c6cdee6c0d280515d21..c809fb56c75640640de81b84f7e686d108b82728 100644 (file)
--- 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 de7cdaf42fc1b5f833b933bd092e6fe195da08af..70efc49b808e0b728ad17b8005d19e5ed7e894e8 100644 (file)
--- 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
index 18f415b3b5ba2edf1e271c0decdbbb1bfc94d0cf..4c8dc4a6cd9e6db5eb641fdb3d25f6378762c2b0 100644 (file)
--- 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 d2406a8b4ff42a7195d5f15b38d081c28ac4fc08..3c341b0670ad76dc0ba1fa8962b7e83a231ca0c0 100644 (file)
--- 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 e0c8e1932b91b8cd70587bfbf309fc0900204bb1..bb4f93fa1ab156bb795182315b2590c9182258ba 100644 (file)
--- 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 a25d1e5957d8a96c2fc4c2c4e0ecc8d4d1ef40b0..6e172a652af65b28c514615d0f05c27da90ec10e 100644 (file)
--- 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 b680185b80125caac67d5a8f63553c93fd3c910c..a8ce0d02402169273ba33246fb26815dc25800e0 100644 (file)
--- 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 faf47b671edc9651de9ad5956617af9de4d2b7da..fbe4aa3db5c52c29c1573e2ebfad906c60b55132 100644 (file)
--- 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 a7d3d9c0a99f6cca7019cca23258dc16d4b50c47..9148ae475f8726e6f18c3418a5afcf5b64cb35ee 100644 (file)
--- 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 90d30269bc687e39b8ae166def6af795affd8fb1..10b2ea281711925b893a8b8ec763ea06ce9b23aa 100644 (file)
--- 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 d50353c50f6d0eeccd022e7914399e0d67c31515..aa23a32fda933c4326ec9ef1501b1a483cbe3a5b 100644 (file)
--- 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 6c967ae1523c41693760db6786b17e9274a160ec..3b17c76e549acf0bd96276820fc3481726816af3 100644 (file)
--- 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 44bed43b69b760f820479df0da8465018ddf9c7d..37c76a7578013fcd3b51f3480a0bd6e802c2e8a6 100644 (file)
--- 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 9d06abffe1b020d5085d238fdb9dba1deca971c6..54e8a727499e0dfa28839d2c6597b3247998fc57 100644 (file)
--- 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 f13456415f15409c5254ba35b83f9ec24283ae86..3c74570a6111160259e33d5fd66c31d9cb34c527 100644 (file)
--- 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 9339d4386ad156607ae87565c5666ad13eb6c8ac..da0e4fe5146e46f15e3d90d99ad4f0a141b3e1d2 100644 (file)
--- 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 8804359c0908dca1006544093615e66a1b31571c..fdadc565e68bd07ed12f3e8dcf3778b4c095811f 100644 (file)
--- 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 b3fe3c07a51d9649180c7541792ad809d8cda3c4..46439925924530f0698d514efadb8aadc63d7a90 100644 (file)
--- 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 54223c2dc35183128104010bb6d4d762ca151f66..65560cd5343571be36c0416cb18e091c5b82a947 100644 (file)
--- 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 b69ef2833e548e4be18ad2af3a3a18a1723c7fe3..b440f360ad9a21526e6c3c66c2142dced2586ac6 100644 (file)
--- 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 38ec39f213e867cfec73056c469e7e6fdb1b97e8..845e5ae07229dfcbfe7a7f34787716d02c50a467 100644 (file)
--- 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 b432184576ce25301b433cf09457685520aa855e..074afb10e468e14f2125c4b6fd44b747e0d042df 100644 (file)
--- 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 d125e1a2df4fe2656c649143304ed4bcdcdce1e6..4ef2fe87b8980d8d42740fc23034617384e386b4 100644 (file)
--- 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 96784d791e56c9c7f22402f47a28bd1c53f96333..6f461b8709b9a60c2d3f1e277f9daaa6e6279bde 100644 (file)
--- 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 911142ad8c835f644c369a4d12539eeed6c62fcb..252421f78ae413e366a9fb8f51a8be91eaa4d4e5 100644 (file)
--- 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 da6d6e23544e8e247715eb12ad3d88eaa0204517..3b8a00a111690120593d381af648e25360aa6f92 100644 (file)
--- 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 d4880b0b8dda32c8aaf87976e5e7c57595fbf792..0adfb7071d85d26b7d7c62e9912c1d1b85adbeb0 100644 (file)
--- 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 92b70b619b82959be9534bc5505539f9cc86ee0f..3542d8abf57856b7d012ce1f502e014674656853 100644 (file)
--- 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 e9d3865a9952e45c5b3b811e47be545d2f170dae..4bfd41c5a848fbf999ead93b3aa21013a568c235 100644 (file)
--- 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 d66f326ad2bf46776e97be77e51e8fe06d0abe15..f2d78f576254f16556248d41d48e205f126bcf00 100644 (file)
--- 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 5c8b1a49367a3006945b3727add62df7e73b36e1..a0ee668b765af134d7221ae3657e97c36caba9b6 100644 (file)
--- 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
index 0f3e6a09fb8e13e6d65cb68ebb78b127d0c955ca..b32dbc9f1f4777563e02da1d43503de2c95bf4b4 100644 (file)
--- 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 896116a8396fb5d77525b2fc61984ad342dae593..248be2aed958dba32badda88e185a6171f11066c 100644 (file)
--- 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 <kernel/OS.h>
 #include <unistd.h>
 #include <sys/socket.h>

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index 12f7f405c440d21acd996d0556d605b0164baecc..fab5edac1a1ceff69824b0a2c32e0660c365a32e 100644 (file)
--- 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 abc4338faedbd1d8395707be0359a645178ece77..7bc652e756339eb9c3ee12f909d9ff5cdba30f4c 100644 (file)
--- 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 668f909d706aeb59fe703acba5a4585c5f782571..bf0295eb8bfc7dff98fa437f5ebb5ea06ae283ef 100644 (file)
--- 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 0ab89197f0dea092a1923cc321c39e47ee96393b..938816af42ed9b8f5b4febaccf209c4c987d47ae 100644 (file)
--- 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 0759416321f8a0545bbd1b0c969f6bad01ea86d1..32b8e1e79d8b3e79afce17ec491da79e8b8731f4 100644 (file)
--- 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 bc31331512966d7b4e4a6d4c37dc0f3f563b5310..51c85644cea460b39c09e9a8d30f90a0256dd2e4 100644 (file)
--- 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 42d821ecaec41c60d401bf33a4bc547293639e47..421e631dea469256c4239aa64cb58bde95d430c6 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -61,8 +61,6 @@
 #include <sys/select.h>
 #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 8948c43c4a95e9a19b9452a64ab7a3b165fd45a3..df2c689ffe686aabae1a637cc4b85e08010c35ba 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -31,8 +31,6 @@
 #include <sys/types.h>
 #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 e245c86b2df05eb72229e280beff79c186adf91c..6d3430c24e1fb39ee44b5629359f01525e337bda 100644 (file)
--- 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 59ee8dc8def333dfcb024f314f867f9902262a64..54452b9c7a7f92ff01c0c3ca67cc83114613ef09 100644 (file)
--- 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 baa1a88bed838481568535277607046e6b2d0d1d..c8e5d1ae554a3ad552f3342059dd2272a45f4dea 100644 (file)
--- 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 6c5d87b48f59876d59aac08a528dfc3662d27085..96e9bede0406acbc714fa060443a73473a688e7f 100644 (file)
--- 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 65b7436c3bcfb8592294c0dd17c759e649e04684..02d0f143ac9b237c6fe099e2286a898244322223 100644 (file)
--- 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 e092e47414853120737cced295f76e13d1f57b08..bab191b6bff5d2d93f666cb9588e96660be5e708 100644 (file)
--- 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 ec844f7af04e6cd9c49843e5c01d4cd0557ad6b5..6602da221bb31b3f3bc18c88eeefcbfee2206606 100644 (file)
--- 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 d052624866acf7003387e16e0fb6456b86cccca5..de23e514e24bd22873b7468d497b42fd42b8b134 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -42,8 +42,6 @@
 #include <netdb.h>              /* 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 ac284a7b21f072d50aa4188df200b654628ac061..a7142e3d78147780e7fd64cac90c073cc032d603 100644 (file)
--- 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 <stdlib.h>
 

diff --git a/server/util_cookies.c b/server/util_cookies.c
index f7f6b79b09312a71158187263e41755590b663b1..376afc0db3177d645cd6a810eb9b6c3a091b761a 100644 (file)
--- 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 f1f265c644b5fe1b583d5de064467ea98b318301..1ea02ccb1b908da8a84355f761555d6cc096a8dd 100644 (file)
--- 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 c6c381e051f9a5e6ebf4c7da6b85d5bded8bf5d3..e13334a118998c0ca586ecbc6cd31d83cc11feb5 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #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 d7a0a07e6d4fd63d37c5286ca6260149a6468d7f..8aebcfd023ec04096cf8d113b409226eb422b50a 100644 (file)
--- 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"