Extern symbols (per the warning) belong elsewhere, since (on Win32) the

  http_main.c is both the startup and entry stub.

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

diff --git a/ApacheCore.def b/ApacheCore.def
index 77db86cbc673b4a1dfc2edcb67171b70ab579597..0d2eb756859c1a71a0f58711865b9866df56cfd0 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -418,7 +418,8 @@ EXPORTS
         ap_sort_hooks
        ap_fini_vhost_config
        ap_fixup_virtual_hosts
-
+        ap_conftree
+        
 ; 
 ; util_xml.h
        ap_text_append

diff --git a/libhttpd.def b/libhttpd.def
index 77db86cbc673b4a1dfc2edcb67171b70ab579597..0d2eb756859c1a71a0f58711865b9866df56cfd0 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -418,7 +418,8 @@ EXPORTS
         ap_sort_hooks
        ap_fini_vhost_config
        ap_fixup_virtual_hosts
-
+        ap_conftree
+        
 ; 
 ; util_xml.h
        ap_text_append

diff --git a/server/config.c b/server/config.c
index 5e5719703e6304c13601cf365406cd5c964c5003..358f32a25ceb82b6d4b1820b77eefe6c69b780ed 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -101,6 +101,8 @@ AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;
 AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
 AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
 
+AP_DECLARE_DATA ap_directive_t *ap_conftree;
+
 AP_HOOK_STRUCT(
            AP_HOOK_LINK(header_parser)
            AP_HOOK_LINK(pre_config)

diff --git a/server/main.c b/server/main.c
index 37bfce47e2725c0121b4bb7cd5096179fe9ceb37..29cdb14449f447607738d65030d7a9853ee1a15b 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -69,8 +69,6 @@
 #include "apr_getopt.h"
 #include "ap_mpm.h"
 
-ap_directive_t *ap_conftree;
-
 /* WARNING: Win32 binds http_main.c dynamically to the server. Please place 
  *          extern functions and global data in another appropriate module.
  *