Get win32 building again... we need something just a little more sophisticated...

Submitted by:	John Sterling <sterling@covalent.net
Reviewed by:	rbb, wrowe

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

diff --git a/include/http_main.h b/include/http_main.h
index 33f9f486afbb6f0c872fecba33a19501475ff13a..a70a91b9f7ec13dd8debb207577694eccafef990 100644 (file)
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -89,7 +89,9 @@ extern AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
  *  effect the server based on command line options */
 extern AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
 
+#ifndef WIN32 /* A -feature- (?) macro is needed here */
 extern void *ap_ugly_hack;
+#endif
 
 #ifdef __cplusplus
 }

diff --git a/server/main.c b/server/main.c
index 6cd35b6474557da12ddb332747a5d8a3112d13b6..24324efcb561195135f4088d480f45735bc6d374 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -294,11 +294,13 @@ int main(int argc, char *argv[])
 
     apr_initialize();
 
+#ifndef WIN32 /* A -feature- (?) macro is needed here */
     /* This ugly little hack pulls any function referenced in exports.c into
      * the web server.  exports.c is generated by buildconf, and it
      * has all of the apr functions specified by httpd.exp.
      */
     ap_ugly_hack = apr_initialize;
+#endif
 
     process = create_process(argc, argv);
     pglobal = process->pool;