Get rid of dependency on os/win32/getopt.c & .h

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

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index f1998b066f5f8d0a4453acf8cc23022ceb9e55e4..b5ceec246df05952b1d3da17f3f62c47518afa96 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -106,10 +106,6 @@ SOURCE=.\buildmark.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\win32\getopt.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\http_config.c
 # End Source File
 # Begin Source File
@@ -298,10 +294,6 @@ SOURCE=.\include\fnmatch.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\win32\getopt.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\hsregex.h
 # End Source File
 # Begin Source File

diff --git a/httpd.dsp b/httpd.dsp
index f1998b066f5f8d0a4453acf8cc23022ceb9e55e4..b5ceec246df05952b1d3da17f3f62c47518afa96 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -106,10 +106,6 @@ SOURCE=.\buildmark.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\win32\getopt.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\http_config.c
 # End Source File
 # Begin Source File
@@ -298,10 +294,6 @@ SOURCE=.\include\fnmatch.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\win32\getopt.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\hsregex.h
 # End Source File
 # Begin Source File

diff --git a/server/main.c b/server/main.c
index ac8f18b08896b2a077ce59c84f6546322e9f3dcd..097af3bd96724466bf82adf86206190e4aa670ff 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -263,7 +263,7 @@ static void usage(process_rec *process)
 
 ap_context_t *g_pHookPool;
 
-extern char *optarg;
+API_VAR_IMPORT char *optarg;
 
 #ifdef WIN32
 API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[])

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 491923a7f805bb9d06c91e5aaadf62b4fb263f47..7a20b066a631a09788dcbd2410d1ce02209a6387 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -66,7 +66,6 @@
 #include "ap_mpm.h"
 #include "ap_config.h"
 #include "ap_listen.h"
-#include "../os/win32/getopt.h"
 #include "mpm_default.h"
 #include "../os/win32/iol_socket.h"
 #include "winnt.h"
@@ -1583,7 +1582,11 @@ die_now:
 static void winnt_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp) 
 {
     char *pid;
-    one_process=1;//!!getenv("ONE_PROCESS");
+#if 0
+    one_process=1;
+#else
+    one_process = !!getenv("ONE_PROCESS");
+#endif
 
     osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx(&osver);