From: Bill Stoddard <stoddard@apache.org>
Date: Mon, 8 Nov 1999 18:54:12 +0000 (+0000)
Subject: Get rid of dependency on os/win32/getopt.c & .h
X-Git-Tag: 1.3.10~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fb176b8aa5d7149fcf0965731d961e146ed4751;p=apache

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 f1998b066f..b5ceec246d 100644
--- 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 f1998b066f..b5ceec246d 100644
--- 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 ac8f18b088..097af3bd96 100644
--- 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 491923a7f8..7a20b066a6 100644
--- 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);