You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Ben Laurie <be...@hyperreal.org> on 1997/09/14 01:10:55 UTC
cvs commit: apachen/src/modules/proxy ApacheModuleProxy.dsp
ben 97/09/13 16:10:53
Modified: src ApacheCore.mak
src/main http_main.c scoreboard.h
src/modules/proxy ApacheModuleProxy.dsp
Log:
Make things compile under Win32 again.
Revision Changes Path
1.16 +113 -289 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApacheCore.mak 1997/09/12 08:05:42 1.15
+++ ApacheCore.mak 1997/09/13 23:10:47 1.16
@@ -28,10 +28,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -101,12 +97,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /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= \
@@ -284,12 +314,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D "WIN32"\
/D "_DEBUG" /D "_WINDOWS" /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= \
@@ -401,36 +465,6 @@
!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"
@@ -444,7 +478,6 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\multithread.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -461,7 +494,7 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\multithread.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -483,14 +516,8 @@
".\main\conf.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_BUFF_=\
- ".\main\sfio.h"\
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
@@ -505,7 +532,7 @@
".\main\conf.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -588,14 +615,8 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_=\
- ".\main\sfio.h"\
"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
@@ -609,7 +630,7 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -636,14 +657,8 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_C=\
- ".\main\sfio.h"\
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
@@ -663,7 +678,7 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -692,17 +707,11 @@
".\main\http_protocol.h"\
".\main\httpd.h"\
".\main\md5.h"\
- ".\main\os.h"\
".\main\rfc1413.h"\
".\main\scoreboard.h"\
".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_CO=\
- ".\main\sfio.h"\
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
@@ -722,12 +731,13 @@
".\main\http_log.h"\
".\main\http_main.h"\
".\main\http_protocol.h"\
+ ".\main\http_request.h"\
".\main\httpd.h"\
".\main\md5.h"\
+ ".\main\os.h"\
".\main\rfc1413.h"\
".\main\scoreboard.h"\
".\main\util_md5.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -751,14 +761,8 @@
".\main\http_core.h"\
".\main\http_log.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_L=\
- ".\main\sfio.h"\
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
@@ -774,8 +778,9 @@
".\main\http_config.h"\
".\main\http_core.h"\
".\main\http_log.h"\
+ ".\main\http_main.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -805,17 +810,11 @@
".\main\http_request.h"\
".\main\httpd.h"\
".\main\multithread.h"\
- ".\main\os.h"\
".\main\scoreboard.h"\
".\os\win32\getopt.h"\
".\os\win32\readdir.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_M=\
- ".\main\sfio.h"\
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
@@ -838,9 +837,9 @@
".\main\http_request.h"\
".\main\httpd.h"\
".\main\multithread.h"\
+ ".\main\os.h"\
".\main\scoreboard.h"\
".\os\win32\getopt.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
@@ -869,15 +868,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_date.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_P=\
- ".\main\sfio.h"\
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
@@ -898,8 +891,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_date.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -927,15 +920,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\scoreboard.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_R=\
- ".\main\sfio.h"\
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
@@ -956,8 +943,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\scoreboard.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -976,10 +963,7 @@
DEP_CPP_MD5C_=\
".\main\conf.h"\
".\main\md5.h"\
- ".\main\os.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
@@ -991,7 +975,7 @@
DEP_CPP_MD5C_=\
".\main\conf.h"\
".\main\md5.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\regex\regex.h"\
@@ -1015,14 +999,8 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_A=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
@@ -1040,7 +1018,7 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1067,15 +1045,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AC=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
@@ -1095,8 +1067,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1118,14 +1090,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AL=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
@@ -1140,7 +1106,7 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1166,15 +1132,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AS=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
@@ -1193,8 +1153,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1219,14 +1179,8 @@
".\main\http_log.h"\
".\main\http_protocol.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AU=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
@@ -1244,7 +1198,7 @@
".\main\http_log.h"\
".\main\http_protocol.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1271,15 +1225,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AUT=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
@@ -1299,8 +1247,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1328,15 +1276,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_C=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
@@ -1357,8 +1299,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1385,15 +1327,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_D=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
@@ -1413,8 +1349,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1436,14 +1372,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_DL=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_DL) "$(INTDIR)"
@@ -1458,7 +1388,7 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1480,14 +1410,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_E=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
@@ -1502,7 +1426,7 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1529,15 +1453,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_I=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
@@ -1557,8 +1475,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1585,17 +1503,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IN=\
- ".\main\sfio.h"\
- ".\modules\standard\config.h"\
- ".\modules\standard\modules\perl\mod_perl.h"\
"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
@@ -1615,8 +1525,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1642,15 +1552,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IS=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
@@ -1669,8 +1573,8 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1693,14 +1597,8 @@
".\main\http_config.h"\
".\main\http_core.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_L=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
@@ -1715,8 +1613,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\http_core.h"\
+ ".\main\http_log.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1738,15 +1637,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_M=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
@@ -1761,8 +1654,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\modules\standard\mod_mime.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1787,15 +1680,9 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_N=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
@@ -1813,8 +1700,8 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1838,14 +1725,8 @@
".\main\http_core.h"\
".\main\http_log.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_S=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
@@ -1862,7 +1743,7 @@
".\main\http_core.h"\
".\main\http_log.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1884,14 +1765,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_U=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
@@ -1906,7 +1781,7 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1928,14 +1803,8 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MODUL=\
- ".\main\sfio.h"\
"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
@@ -1950,7 +1819,7 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1969,10 +1838,7 @@
DEP_CPP_MULTI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\main\os.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
@@ -1984,7 +1850,7 @@
DEP_CPP_MULTI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\regex\regex.h"\
@@ -1996,23 +1862,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)"
@@ -2032,15 +1894,9 @@
".\main\http_log.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\rfc1413.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_RFC14=\
- ".\main\sfio.h"\
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
@@ -2056,8 +1912,8 @@
".\main\http_log.h"\
".\main\http_main.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
".\main\rfc1413.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -2076,11 +1932,8 @@
DEP_CPP_SERVI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\main\os.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
@@ -2092,7 +1945,7 @@
DEP_CPP_SERVI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
@@ -2114,14 +1967,8 @@
".\main\conf.h"\
".\main\http_conf_globals.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_=\
- ".\main\sfio.h"\
"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
@@ -2136,7 +1983,7 @@
".\main\conf.h"\
".\main\http_conf_globals.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -2154,11 +2001,8 @@
DEP_CPP_UTIL_D=\
".\main\conf.h"\
- ".\main\os.h"\
".\main\util_date.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
@@ -2169,8 +2013,8 @@
DEP_CPP_UTIL_D=\
".\main\conf.h"\
+ ".\main\os.h"\
".\main\util_date.h"\
- ".\os\win32\os.h"\
".\regex\regex.h"\
@@ -2191,15 +2035,9 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\md5.h"\
- ".\main\os.h"\
".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_M=\
- ".\main\sfio.h"\
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
@@ -2214,8 +2052,8 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\md5.h"\
+ ".\main\os.h"\
".\main\util_md5.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -2243,15 +2081,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_S=\
- ".\main\sfio.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
@@ -2272,8 +2104,9 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
+ ".\main\os.h"\
+ ".\main\util_date.h"\
".\main\util_script.h"\
- ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -2291,10 +2124,7 @@
DEP_CPP_UTIL_SN=\
".\main\conf.h"\
- ".\main\os.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)"
@@ -2305,7 +2135,7 @@
DEP_CPP_UTIL_SN=\
".\main\conf.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\regex\regex.h"\
@@ -2325,14 +2155,8 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_W=\
- ".\main\sfio.h"\
"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
@@ -2346,7 +2170,7 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\os\win32\os.h"\
+ ".\main\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
1.222 +1 -1 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- http_main.c 1997/09/12 21:48:36 1.221
+++ http_main.c 1997/09/13 23:10:50 1.222
@@ -1548,7 +1548,7 @@
#endif /* MULTITHREAD */
-int exists_scoreboard_image (void)
+API_EXPORT(int) exists_scoreboard_image (void)
{
return (scoreboard_image ? 1 : 0);
}
1.31 +3 -3 apachen/src/main/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/scoreboard.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- scoreboard.h 1997/09/12 20:37:35 1.30
+++ scoreboard.h 1997/09/13 23:10:51 1.31
@@ -148,10 +148,10 @@
#define SCOREBOARD_SIZE sizeof(scoreboard)
-void sync_scoreboard_image(void);
-int exists_scoreboard_image (void);
+API_EXPORT(void) sync_scoreboard_image(void);
+API_EXPORT(int) exists_scoreboard_image (void);
-extern scoreboard *scoreboard_image;
+API_VAR_EXPORT extern scoreboard *scoreboard_image;
/* for time_process_request() in http_main.c */
#define START_PREQUEST 1
1.4 +1 -1 apachen/src/modules/proxy/ApacheModuleProxy.dsp
Index: ApacheModuleProxy.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleProxy.dsp 1997/08/23 14:12:42 1.3
+++ ApacheModuleProxy.dsp 1997/09/13 23:10:52 1.4
@@ -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 "..\..\main" /I "..\..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"