stoddard 99/11/08 10:54:16
Modified: src/main http_main.c
src/lib/apr/include apr_win.h
src ApacheCore.dsp ApacheCore.mak
src/modules/mpm/winnt winnt.c
Log:
Get rid of dependency on os/win32/getopt.c & .h
Revision Changes Path
1.19 +1 -1 apache-2.0/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- http_main.c 1999/10/19 15:54:52 1.18
+++ http_main.c 1999/11/08 18:53:55 1.19
@@ -263,7 +263,7 @@
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[])
1.5 +1 -1 apache-2.0/src/lib/apr/include/apr_win.h
Index: apr_win.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_win.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_win.h 1999/10/18 12:43:58 1.4
+++ apr_win.h 1999/11/08 18:54:00 1.5
@@ -133,7 +133,7 @@
#define API_EXPORT(x) x
#define API_EXPORT_NONSTD(x) x
#define API_THREAD_FUNC __stdcall
-#define API_VAR_IMPORT _declspec(dllimport)
+#define API_VAR_IMPORT extern _declspec(dllimport)
#define strcasecmp(s1, s2) stricmp(s1, s2)
#define sleep(t) Sleep(t * 1000)
1.6 +0 -8 apache-2.0/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheCore.dsp 1999/10/14 14:07:55 1.5
+++ ApacheCore.dsp 1999/11/08 18:54:04 1.6
@@ -106,10 +106,6 @@
# 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
@@ -295,10 +291,6 @@
# Begin Source File
SOURCE=.\include\fnmatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\getopt.h
# End Source File
# Begin Source File
1.7 +57 -94 apache-2.0/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheCore.mak 1999/10/14 14:01:11 1.6
+++ ApacheCore.mak 1999/11/08 18:54:06 1.7
@@ -28,6 +28,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -49,7 +53,6 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
- [EMAIL PROTECTED] "$(INTDIR)\getopt.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_config.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_connection.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_core.obj"
@@ -95,46 +98,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /D\
"NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"\
/Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -151,7 +120,6 @@
LINK32_OBJS= \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
- "$(INTDIR)\getopt.obj" \
"$(INTDIR)\http_config.obj" \
"$(INTDIR)\http_connection.obj" \
"$(INTDIR)\http_core.obj" \
@@ -218,8 +186,6 @@
[EMAIL PROTECTED] "$(INTDIR)\buff.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.sbr"
- [EMAIL PROTECTED] "$(INTDIR)\getopt.obj"
- [EMAIL PROTECTED] "$(INTDIR)\getopt.sbr"
[EMAIL PROTECTED] "$(INTDIR)\http_config.obj"
[EMAIL PROTECTED] "$(INTDIR)\http_config.sbr"
[EMAIL PROTECTED] "$(INTDIR)\http_connection.obj"
@@ -306,52 +272,17 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I
".\lib\apr\include"\
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"
/FR"$(INTDIR)\\"\
/Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
"$(INTDIR)\buff.sbr" \
"$(INTDIR)\buildmark.sbr" \
- "$(INTDIR)\getopt.sbr" \
"$(INTDIR)\http_config.sbr" \
"$(INTDIR)\http_connection.sbr" \
"$(INTDIR)\http_core.sbr" \
@@ -407,7 +338,6 @@
LINK32_OBJS= \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
- "$(INTDIR)\getopt.obj" \
"$(INTDIR)\http_config.obj" \
"$(INTDIR)\http_connection.obj" \
"$(INTDIR)\http_core.obj" \
@@ -453,7 +383,37 @@
!ENDIF
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
SOURCE=.\main\buff.c
@@ -566,6 +526,14 @@
".\lib\apr\include\apr_lib.h"\
".\lib\apr\include\apr_win.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_BUILD=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\lib\apr\include\apr_config.h"\
"$(INTDIR)\buildmark.obj" "$(INTDIR)\buildmark.sbr" : $(SOURCE)\
@@ -574,24 +542,6 @@
!ENDIF
-SOURCE=.\os\win32\getopt.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-
-"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-
-"$(INTDIR)\getopt.obj" "$(INTDIR)\getopt.sbr" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\main\http_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -696,6 +646,7 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\mpm_status.h"\
".\include\util_uri.h"\
".\lib\apr\file_io\win32\readdir.h"\
".\lib\apr\include\apr_errno.h"\
@@ -734,6 +685,7 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\mpm_status.h"\
".\include\util_uri.h"\
".\lib\apr\file_io\win32\readdir.h"\
".\lib\apr\include\apr_errno.h"\
@@ -1013,6 +965,7 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\mpm_status.h"\
".\include\util_date.h"\
".\include\util_uri.h"\
".\lib\apr\file_io\win32\readdir.h"\
@@ -1053,6 +1006,7 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\mpm_status.h"\
".\include\util_date.h"\
".\include\util_uri.h"\
".\lib\apr\file_io\win32\readdir.h"\
@@ -3186,10 +3140,12 @@
".\lib\apr\include\apr_time.h"\
".\lib\apr\include\apr_win.h"\
".\modules\mpm\winnt\mpm_default.h"\
- ".\os\win32\getopt.h"\
".\os\win32\iol_socket.h"\
".\os\win32\os.h"\
+NODEP_CPP_WINNT=\
+ ".\os\win32\getopt.h"\
+
"$(INTDIR)\winnt.obj" : $(SOURCE) $(DEP_CPP_WINNT) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -3228,9 +3184,16 @@
".\lib\apr\include\apr_time.h"\
".\lib\apr\include\apr_win.h"\
".\modules\mpm\winnt\mpm_default.h"\
- ".\os\win32\getopt.h"\
".\os\win32\iol_socket.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_WINNT=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\lib\apr\include\apr_config.h"\
"$(INTDIR)\winnt.obj" "$(INTDIR)\winnt.sbr" : $(SOURCE)
$(DEP_CPP_WINNT)\
1.29 +5 -2 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- winnt.c 1999/11/04 20:36:08 1.28
+++ winnt.c 1999/11/08 18:54:12 1.29
@@ -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 @@
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);
