pcs 98/02/28 04:22:29
Modified: src ApacheCore.dsp ApacheCore.mak
src/main util_uri.c
Log:
Add uril_uri.c to the Win32 build (required since util_uri_init() is
always called from common init, even if WITH_UTIL_URI is off.
Also make util_uri.c compile on Win32.
Revision Changes Path
1.22 +4 -0 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ApacheCore.dsp 1998/02/24 12:27:14 1.21
+++ ApacheCore.dsp 1998/02/28 12:22:25 1.22
@@ -265,6 +265,10 @@
# End Source File
# Begin Source File
+SOURCE=.\main\util_uri.c
+# End Source File
+# Begin Source File
+
SOURCE=.\os\win32\util_win32.c
# End Source File
# End Group
1.32 +373 -9 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ApacheCore.mak 1998/02/24 12:27:15 1.31
+++ ApacheCore.mak 1998/02/28 12:22:26 1.32
@@ -93,6 +93,7 @@
[EMAIL PROTECTED] "$(INTDIR)\util_date.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_md5.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_script.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\util_uri.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
@@ -164,6 +165,7 @@
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
+ "$(INTDIR)\util_uri.obj" \
"$(INTDIR)\util_win32.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -274,6 +276,8 @@
[EMAIL PROTECTED] "$(INTDIR)\util_md5.sbr"
[EMAIL PROTECTED] "$(INTDIR)\util_script.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_script.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\util_uri.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\util_uri.sbr"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.sbr"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
@@ -339,6 +343,7 @@
"$(INTDIR)\util_date.sbr" \
"$(INTDIR)\util_md5.sbr" \
"$(INTDIR)\util_script.sbr" \
+ "$(INTDIR)\util_uri.sbr" \
"$(INTDIR)\util_win32.sbr"
"$(OUTDIR)\ApacheCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
@@ -398,6 +403,7 @@
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
+ "$(INTDIR)\util_uri.obj" \
"$(INTDIR)\util_win32.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -496,8 +502,16 @@
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_BUFF_=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
@@ -593,8 +607,16 @@
".\include\conf.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
@@ -639,8 +661,16 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
@@ -698,8 +728,16 @@
".\include\rfc1413.h"\
".\include\scoreboard.h"\
".\include\util_md5.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_CO=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
@@ -754,8 +792,16 @@
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
@@ -809,11 +855,19 @@
".\include\multithread.h"\
".\include\scoreboard.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\getopt.h"\
".\os\win32\os.h"\
".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
@@ -841,6 +895,7 @@
".\include\multithread.h"\
".\include\scoreboard.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\getopt.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -875,8 +930,16 @@
".\include\http_vhost.h"\
".\include\httpd.h"\
".\include\util_date.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
@@ -931,8 +994,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\scoreboard.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
@@ -983,8 +1054,16 @@
".\include\http_protocol.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
@@ -1017,15 +1096,20 @@
!ENDIF
SOURCE=.\main\md5c.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
DEP_CPP_MD5C_=\
".\include\conf.h"\
".\include\hsregex.h"\
".\include\md5.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MD5C_=\
+ ".\include\os.h"\
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1033,6 +1117,12 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_MD5C_=\
+ ".\include\conf.h"\
+ ".\include\hsregex.h"\
+ ".\include\md5.h"\
+ ".\os\win32\os.h"\
+
"$(INTDIR)\md5c.obj" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\
"$(INTDIR)"
@@ -1056,8 +1146,16 @@
".\include\http_log.h"\
".\include\http_request.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
@@ -1106,8 +1204,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
@@ -1153,8 +1259,16 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
@@ -1199,8 +1313,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
@@ -1248,8 +1370,16 @@
".\include\http_log.h"\
".\include\http_protocol.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
@@ -1298,8 +1428,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
@@ -1352,8 +1490,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
@@ -1406,8 +1552,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
@@ -1453,8 +1607,16 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
@@ -1500,8 +1662,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
@@ -1553,8 +1723,18 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\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)"
@@ -1605,8 +1785,15 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
@@ -1653,8 +1840,16 @@
".\include\http_core.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
@@ -1696,9 +1891,17 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_M=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
@@ -1743,8 +1946,16 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
@@ -1790,8 +2001,16 @@
".\include\http_core.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
@@ -1834,8 +2053,16 @@
".\include\http_config.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
@@ -1876,8 +2103,16 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
@@ -1917,8 +2152,15 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MODUL=\
+ ".\include\ebcdic.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
@@ -1947,22 +2189,30 @@
!ENDIF
SOURCE=.\os\win32\multithread.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
DEP_CPP_MULTI=\
".\include\conf.h"\
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-
"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_MULTI=\
+ ".\include\conf.h"\
+ ".\include\hsregex.h"\
+ ".\include\multithread.h"\
+ ".\os\win32\os.h"\
+
"$(INTDIR)\multithread.obj" "$(INTDIR)\multithread.sbr" : $(SOURCE)\
$(DEP_CPP_MULTI) "$(INTDIR)"
@@ -1972,12 +2222,13 @@
!ENDIF
SOURCE=.\os\win32\readdir.c
-DEP_CPP_READD=\
- ".\os\win32\readdir.h"\
-
!IF "$(CFG)" == "ApacheCore - Win32 Release"
+DEP_CPP_READD=\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1985,6 +2236,9 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_READD=\
+ ".\os\win32\readdir.h"\
+
"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE)
$(DEP_CPP_READD)\
"$(INTDIR)"
@@ -2005,8 +2259,15 @@
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_REGIS=\
+ ".\include\ebcdic.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
@@ -2048,8 +2309,16 @@
".\include\http_main.h"\
".\include\httpd.h"\
".\include\rfc1413.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_RFC14=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
@@ -2094,10 +2363,17 @@
".\include\http_main.h"\
".\include\httpd.h"\
".\include\multithread.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\os\win32\registry.h"\
".\os\win32\service.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_SERVI=\
+ ".\include\ebcdic.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
@@ -2143,8 +2419,16 @@
".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
@@ -2182,6 +2466,11 @@
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_D=\
+ ".\include\os.h"\
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
@@ -2217,8 +2506,16 @@
".\include\httpd.h"\
".\include\md5.h"\
".\include\util_md5.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
@@ -2267,8 +2564,16 @@
".\include\httpd.h"\
".\include\util_date.h"\
".\include\util_script.h"\
+ ".\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\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
@@ -2304,6 +2609,58 @@
!ENDIF
+SOURCE=.\main\util_uri.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_UTIL_U=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\buff.h"\
+ ".\include\conf.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_conf_globals.h"\
+ ".\include\http_log.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_U=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
+
+
+"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+DEP_CPP_UTIL_U=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\buff.h"\
+ ".\include\conf.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_conf_globals.h"\
+ ".\include\http_log.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+
+
+"$(INTDIR)\util_uri.obj" "$(INTDIR)\util_uri.sbr" : $(SOURCE)
$(DEP_CPP_UTIL_U)\
+ "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\os\win32\util_win32.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -2315,8 +2672,15 @@
".\include\conf.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
+ ".\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\ebcdic.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
1.4 +1 -1 apache-1.3/src/main/util_uri.c
Index: util_uri.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util_uri.c 1998/02/28 10:31:59 1.3
+++ util_uri.c 1998/02/28 12:22:29 1.4
@@ -253,7 +253,7 @@
* returning a directory for the root drive.
*/
for (s = uptr->path; (s = strchr(s, '\\')) != NULL; )
- *s = '/';
+ *(char *)s = '/';
#ifndef WIN32 /* for OS/2 only: */
/* Fix OS/2 HPFS filename case problem. */
uptr->path = strlwr(uptr->path);
