stoddard 99/06/30 02:09:45
Modified: src ApacheCore.dsp ApacheCore.mak
src/include ap_config.h
src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak
src/os/win32 ApacheModuleRewrite.dsp ApacheModuleRewrite.mak
os.h
src/support htpasswd.dsp htpasswd.mak
Log:
Win32: Update Apache to use winsock2. This is a prereq to using the enhanced
comm APIs (WSADuplicateSocket, et. al.). I hope I don't regret this...
Revision Changes Path
1.30 +4 -4 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApacheCore.dsp 1999/01/19 14:20:38 1.29
+++ ApacheCore.dsp 1999/06/30 09:09:35 1.30
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib
ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll
/machine:I386
+# ADD LINK32 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib
ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll
/machine:I386
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
+# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
# SUBTRACT LINK32 /map
!ENDIF
1.42 +18 -330 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ApacheCore.mak 1999/01/19 14:20:38 1.41
+++ ApacheCore.mak 1999/06/30 09:09:35 1.42
@@ -100,9 +100,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
- /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\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=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -113,7 +113,7 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\
ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib\
- advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
+ advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\
/def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
/implib:"$(OUTDIR)\ApacheCore.lib"
@@ -280,9 +280,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\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/
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -339,7 +339,7 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib\
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
+ advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386\
/def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
/implib:"$(OUTDIR)\ApacheCore.lib"
@@ -446,14 +446,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_ALLOC=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
@@ -503,15 +495,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_BUFF_=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -558,14 +542,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_BUILD=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
@@ -634,15 +610,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -707,14 +675,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_C=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
@@ -778,15 +738,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_L=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -851,14 +803,6 @@
".\os\win32\readdir.h"\
".\os\win32\registry.h"\
".\os\win32\service.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_M=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
@@ -928,15 +872,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_P=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -999,14 +935,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_R=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
@@ -1066,15 +994,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_HTTP_V=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1128,14 +1048,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_A=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
@@ -1192,15 +1104,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_AC=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1253,14 +1157,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AL=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
@@ -1313,15 +1209,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_AS=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1365,6 +1253,7 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_md5.h"\
".\include\ap_mmn.h"\
".\include\buff.h"\
".\include\hsregex.h"\
@@ -1376,15 +1265,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_AU=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1397,6 +1278,7 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_md5.h"\
".\include\ap_mmn.h"\
".\include\buff.h"\
".\include\hsregex.h"\
@@ -1428,6 +1310,7 @@
".\include\ap_ctype.h"\
".\include\ap_mmn.h"\
".\include\buff.h"\
+ ".\include\fnmatch.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1440,15 +1323,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_AUT=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1463,6 +1338,7 @@
".\include\ap_ctype.h"\
".\include\ap_mmn.h"\
".\include\buff.h"\
+ ".\include\fnmatch.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1508,15 +1384,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_C=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1576,14 +1444,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_D=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
@@ -1637,15 +1497,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_E=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1698,14 +1550,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_I=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
@@ -1765,17 +1609,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_IN=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
- ".\modules\standard\config.h"\
- ".\modules\standard\modules\perl\mod_perl.h"\
-
"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1833,13 +1667,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IS=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
@@ -1894,15 +1721,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_L=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1952,14 +1771,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_M=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
@@ -2013,15 +1824,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_N=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2075,14 +1878,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_S=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
@@ -2133,15 +1928,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MOD_SO=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2189,14 +1976,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_U=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
@@ -2244,14 +2023,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MODUL=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2292,11 +2064,6 @@
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MULTI=\
- ".\include\ap_config_auto.h"\
"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
@@ -2322,23 +2089,19 @@
!ENDIF
SOURCE=.\os\win32\readdir.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_READD=\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\types.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_READD=\
- ".\os\win32\readdir.h"\
-
"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE)
$(DEP_CPP_READD)\
"$(INTDIR)"
@@ -2364,14 +2127,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_REGIS=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2420,14 +2176,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_RFC14=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
@@ -2482,14 +2230,7 @@
".\os\win32\readdir.h"\
".\os\win32\registry.h"\
".\os\win32\service.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SERVI=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2543,14 +2284,6 @@
".\main\test_char.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
@@ -2584,9 +2317,6 @@
!ENDIF
SOURCE=.\main\util_date.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_UTIL_D=\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
@@ -2594,28 +2324,17 @@
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_D=\
- ".\include\ap_config_auto.h"\
- ".\include\os.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_UTIL_D=\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\ap_mmn.h"\
- ".\include\hsregex.h"\
- ".\include\util_date.h"\
- ".\os\win32\os.h"\
-
"$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_D) "$(INTDIR)"
@@ -2642,15 +2361,7 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_UTIL_M=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2706,14 +2417,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_S=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
@@ -2771,15 +2474,7 @@
".\main\uri_delims.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_UTIL_U=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\os.h"\
- ".\include\sfio.h"\
-
"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2828,13 +2523,6 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_W=\
- ".\include\ap_config_auto.h"\
- ".\include\ebcdic.h"\
- ".\include\sfio.h"\
"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
1.262 +1 -1 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- ap_config.h 1999/06/05 05:54:45 1.261
+++ ap_config.h 1999/06/30 09:09:37 1.262
@@ -1033,7 +1033,7 @@
#endif
#else /* WIN32 */
-#include <winsock.h>
+#include <winsock2.h>
#include <malloc.h>
#include <io.h>
#include <fcntl.h>
1.10 +4 -4 apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp
Index: ApacheModuleProxy.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApacheModuleProxy.dsp 1998/04/12 19:02:05 1.9
+++ ApacheModuleProxy.dsp 1999/06/30 09:09:38 1.10
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo
/subsystem:windows /dll /machine:I386
+# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo
/subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo
/subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo
/subsystem:windows /dll /debug /machine:I386
!ENDIF
1.14 +55 -68 apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApacheModuleProxy.mak 1998/08/09 14:33:13 1.13
+++ ApacheModuleProxy.mak 1999/06/30 09:09:38 1.14
@@ -30,6 +30,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
OUTDIR=.\Release
@@ -63,53 +67,20 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D\
- "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+ "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
+ /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
/FD\
+ /c
CPP_OBJS=.\Release/
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)\ApacheModuleProxy.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
/subsystem:windows /dll /incremental:no
/pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
/machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
/implib:"$(OUTDIR)\ApacheModuleProxy.lib"
@@ -162,12 +133,37 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"
/Fp"$(INTDIR)\ApacheModuleProxy.pch"\
- /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+ "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
+ /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
/FD\
+ /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
+ /subsystem:windows /dll /incremental:yes
/pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
+ /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleProxy.lib"
+LINK32_OBJS= \
+ "$(INTDIR)\mod_proxy.obj" \
+ "$(INTDIR)\proxy_cache.obj" \
+ "$(INTDIR)\proxy_connect.obj" \
+ "$(INTDIR)\proxy_ftp.obj" \
+ "$(INTDIR)\proxy_http.obj" \
+ "$(INTDIR)\proxy_util.obj"
+
+"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
@@ -199,35 +195,7 @@
$(CPP_PROJ) $<
<<
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
- /subsystem:windows /dll /incremental:yes
/pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
- /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
- /implib:"$(OUTDIR)\ApacheModuleProxy.lib"
-LINK32_OBJS= \
- "$(INTDIR)\mod_proxy.obj" \
- "$(INTDIR)\proxy_cache.obj" \
- "$(INTDIR)\proxy_connect.obj" \
- "$(INTDIR)\proxy_ftp.obj" \
- "$(INTDIR)\proxy_http.obj" \
- "$(INTDIR)\proxy_util.obj"
-"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
"ApacheModuleProxy - Win32 Debug"
SOURCE=.\mod_proxy.c
@@ -239,6 +207,7 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -264,12 +233,14 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_protocol.h"\
+ "..\..\include\http_request.h"\
"..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
"..\..\include\util_uri.h"\
@@ -293,9 +264,11 @@
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\ap_md5.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
+ "..\..\include\http_conf_globals.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
@@ -320,9 +293,11 @@
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\ap_md5.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
+ "..\..\include\http_conf_globals.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
@@ -350,6 +325,7 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -374,6 +350,7 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -402,10 +379,12 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
+ "..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
@@ -426,10 +405,12 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
+ "..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
@@ -454,6 +435,7 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -480,6 +462,7 @@
"..\..\include\ap.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -511,6 +494,7 @@
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\ap_md5.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -520,6 +504,7 @@
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
"..\..\include\multithread.h"\
+ "..\..\include\util_date.h"\
"..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
@@ -537,6 +522,7 @@
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\ap_md5.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
@@ -546,6 +532,7 @@
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
"..\..\include\multithread.h"\
+ "..\..\include\util_date.h"\
"..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
1.11 +4 -4 apache-1.3/src/os/win32/ApacheModuleRewrite.dsp
Index: ApacheModuleRewrite.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.dsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheModuleRewrite.dsp 1998/04/06 05:21:47 1.10
+++ ApacheModuleRewrite.dsp 1999/06/30 09:09:41 1.11
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D
"WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo
/subsystem:windows /dll /machine:I386
+# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo
/subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D
"WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo
/subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo
/subsystem:windows /dll /debug /machine:I386
!ENDIF
1.13 +14 -9 apache-1.3/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApacheModuleRewrite.mak 1998/08/13 01:55:23 1.12
+++ ApacheModuleRewrite.mak 1999/06/30 09:09:42 1.13
@@ -64,7 +64,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D\
- "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE"\
+ "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D
"WIN32_LEAN_AND_MEAN"\
/Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
/FD /c
CPP_OBJS=.\ApacheModuleRewriteR/
@@ -76,7 +76,7 @@
LINK32=link.exe
LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
/subsystem:windows /dll /incremental:no\
/pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
@@ -123,9 +123,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE"\
- /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
- /FD /c
+ "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\
+ "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleRewriteD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -135,7 +135,7 @@
LINK32=link.exe
LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
/subsystem:windows /dll /incremental:yes\
/pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /debug /machine:I386\
/out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
@@ -191,18 +191,21 @@
DEP_CPP_MOD_R=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_config.h"\
+ "..\..\include\ap_ctype.h"\
"..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
- "..\..\include\conf.h"\
"..\..\include\hsregex.h"\
+ "..\..\include\http_conf_globals.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_request.h"\
+ "..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\modules\standard\mod_rewrite.h"\
".\os.h"\
- ".\passwd.h"\
".\readdir.h"\
@@ -215,10 +218,12 @@
DEP_CPP_MOD_R=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_config.h"\
+ "..\..\include\ap_ctype.h"\
"..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
- "..\..\include\conf.h"\
"..\..\include\hsregex.h"\
+ "..\..\include\http_conf_globals.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
"..\..\include\http_log.h"\
1.30 +1 -1 apache-1.3/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- os.h 1999/05/02 14:01:03 1.29
+++ os.h 1999/06/30 09:09:43 1.30
@@ -18,7 +18,7 @@
#include <direct.h>
#define STATUS
-#define WIN32_LEAN_AND_MEAN
+/*#define WIN32_LEAN_AND_MEAN Now defined in project files */
#ifndef STRICT
#define STRICT
#endif
1.7 +4 -4 apache-1.3/src/support/htpasswd.dsp
Index: htpasswd.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/htpasswd.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htpasswd.dsp 1999/06/08 17:05:43 1.6
+++ htpasswd.dsp 1999/06/30 09:09:44 1.7
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D
"_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
@@ -66,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG"
/D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32"
/D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug
/machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug
/machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.7 +115 -10 apache-1.3/src/support/htpasswd.mak
Index: htpasswd.mak
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htpasswd.mak 1999/06/08 17:05:44 1.6
+++ htpasswd.mak 1999/06/30 09:09:44 1.7
@@ -60,9 +60,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
+ "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\htpasswd.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
CPP_SBRS=.
BSC32=bscmake.exe
@@ -71,7 +71,7 @@
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:console
/incremental:no\
+ advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no\
/pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe"
LINK32_OBJS= \
"$(INTDIR)\ap_cpystrn.obj" \
@@ -118,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htpasswd.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
+ "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
+ /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
BSC32=bscmake.exe
@@ -128,9 +128,9 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
- comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\
- /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console
/incremental:yes\
+ /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
/out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\ap_cpystrn.obj" \
@@ -180,6 +180,9 @@
!IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
"htpasswd - Win32 Debug"
SOURCE=..\ap\ap_cpystrn.c
+
+!IF "$(CFG)" == "htpasswd - Win32 Release"
+
DEP_CPP_AP_CP=\
"..\include\alloc.h"\
"..\include\ap.h"\
@@ -192,13 +195,67 @@
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_CP=\
+ "..\include\ap_config_auto.h"\
+ "..\include\ebcdic.h"\
+ "..\include\os.h"\
+ "..\include\sfio.h"\
"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
+
+DEP_CPP_AP_CP=\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\ap_config.h"\
+ "..\include\ap_ctype.h"\
+ "..\include\ap_mmn.h"\
+ "..\include\buff.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
+ "..\include\util_uri.h"\
+ "..\os\win32\os.h"\
+ "..\os\win32\readdir.h"\
+
+
+"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=..\ap\ap_getpass.c
+
+!IF "$(CFG)" == "htpasswd - Win32 Release"
+
+DEP_CPP_AP_GE=\
+ "..\include\ap.h"\
+ "..\include\ap_config.h"\
+ "..\include\ap_ctype.h"\
+ "..\include\ap_mmn.h"\
+ "..\include\hsregex.h"\
+ "..\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_GE=\
+ "..\include\ap_config_auto.h"\
+ "..\include\os.h"\
+
+
+"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
+
DEP_CPP_AP_GE=\
"..\include\ap.h"\
"..\include\ap_config.h"\
@@ -212,6 +269,8 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ENDIF
+
SOURCE=..\ap\ap_md5c.c
!IF "$(CFG)" == "htpasswd - Win32 Release"
@@ -224,6 +283,13 @@
"..\include\ap_mmn.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_MD=\
+ "..\ap\ebcdic.h"\
+ "..\include\ap_config_auto.h"\
+ "..\include\os.h"\
"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
@@ -249,6 +315,9 @@
!ENDIF
SOURCE=..\ap\ap_snprintf.c
+
+!IF "$(CFG)" == "htpasswd - Win32 Release"
+
DEP_CPP_AP_SN=\
"..\include\alloc.h"\
"..\include\ap.h"\
@@ -261,12 +330,42 @@
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_AP_SN=\
+ "..\include\ap_config_auto.h"\
+ "..\include\ebcdic.h"\
+ "..\include\os.h"\
+ "..\include\sfio.h"\
+
"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
+
+DEP_CPP_AP_SN=\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\ap_config.h"\
+ "..\include\ap_ctype.h"\
+ "..\include\ap_mmn.h"\
+ "..\include\buff.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
+ "..\include\util_uri.h"\
+ "..\os\win32\os.h"\
+ "..\os\win32\readdir.h"\
+
+
+"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\htpasswd.c
!IF "$(CFG)" == "htpasswd - Win32 Release"
@@ -280,6 +379,12 @@
"..\include\hsregex.h"\
"..\os\win32\getopt.h"\
"..\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTPAS=\
+ "..\include\ap_config_auto.h"\
+ "..\include\os.h"\
"$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
