PR:

Obtained from:
Submitted by:
Reviewed by:

  Cleaning up.  Note that apache (or https) -D DEFINE is now enabled, the
  shared data is now properly moved to either ap_hooks.c or http_config.c,
  and all should be well with rewrite_args.

  Next stop, no more apache_main entry point.  That's why this file needs
  to be empty of any callbacks or shared data, as it will bind to the core
  but the core won't be looking back into http_main.

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

diff --git a/server/main.c b/server/main.c
index f6119492ea05285d6860f605bf895fd31858e7ab..6e2d2a19c495a85006eac52d6fd4b3f9872d71d1 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -273,7 +273,7 @@ static void usage(process_rec *process)
 }
 
 #ifdef WIN32
-API_EXPORT(int) apache_main(int argc, char *argv[])
+API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[])
 #else
 API_EXPORT(int)        main(int argc, char *argv[])
 #endif