stoddard 99/11/29 15:29:37
Modified: src/ap ap.mak
src/lib/apr aprlib.def aprlib.dsp aprlib.mak
src/lib/apr/misc/win32 misc.h start.c
src/main gen_test_char.mak gen_uri_delims.mak
Log:
Fix some Windows compile breaks
Revision Changes Path
1.7 +28 -54 apache-2.0/src/ap/ap.mak
Index: ap.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.mak 1999/10/07 14:08:27 1.6
+++ ap.mak 1999/11/29 23:28:50 1.7
@@ -25,6 +25,8 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+
!IF "$(CFG)" == "ap - Win32 Release"
OUTDIR=.\Release
@@ -53,43 +55,11 @@
"$(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\
"WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.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) $<
-<<
-
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
BSC32_SBRS= \
@@ -134,13 +104,29 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I
"../lib/apr/include"\
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX
/Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\ap_base64.obj" \
+ "$(INTDIR)\ap_hooks.obj" \
+ "$(INTDIR)\ap_sha1.obj"
+
+"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+!ENDIF
+
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -171,24 +157,6 @@
$(CPP_PROJ) $<
<<
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
-BSC32_SBRS= \
-
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
-LIB32_OBJS= \
- "$(INTDIR)\ap_base64.obj" \
- "$(INTDIR)\ap_hooks.obj" \
- "$(INTDIR)\ap_sha1.obj"
-
-"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
SOURCE=.\ap_base64.c
@@ -197,10 +165,12 @@
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
- "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
+NODEP_CPP_AP_BA=\
+ "..\include\apr.h"\
+
"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
@@ -213,7 +183,6 @@
"..\include\ap_hooks.h"\
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
- "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -226,6 +195,9 @@
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
+NODEP_CPP_AP_HO=\
+ "..\include\apr.h"\
+
"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
@@ -238,7 +210,6 @@
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
"..\include\ap_sha1.h"\
- "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -250,6 +221,9 @@
"..\lib\apr\include\apr_lib.h"\
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
+
+NODEP_CPP_AP_SH=\
+ "..\include\apr.h"\
"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
1.6 +10 -10 apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aprlib.def 1999/10/25 23:55:43 1.5
+++ aprlib.def 1999/11/29 23:29:11 1.6
@@ -80,11 +80,11 @@
ap_clear_poll_sockets @72
; ap_setipaddr @73
; ap_getipaddr @74
- ap_create_signal @75
- ap_setup_signal @76
-SignalHandling @77
- ap_send_signal @78
-thread_ready @79
+; ap_create_signal @75
+; ap_setup_signal @76
+; SignalHandling @77
+; ap_send_signal @78
+; thread_ready @79
ap_createprocattr_init @80
ap_setprocattr_io @81
ap_setprocattr_dir @82
@@ -127,11 +127,11 @@
ap_set_userdata @119
ap_initialize @120
ap_getopt @121
- opterr @122 DATA
- optind @123 DATA
- optopt @124 DATA
- optreset @125 DATA
- optarg @126 DATA
+ ap_opterr @122 DATA
+ ap_optind @123 DATA
+ ap_optopt @124 DATA
+ ap_optreset @125 DATA
+ ap_optarg @126 DATA
ap_make_time @127
ap_current_time @128
ap_explode_time @129
1.5 +1 -5 apache-2.0/src/lib/apr/aprlib.dsp
Index: aprlib.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprlib.dsp 1999/10/25 23:55:41 1.4
+++ aprlib.dsp 1999/11/29 23:29:15 1.5
@@ -204,10 +204,6 @@
# End Source File
# Begin Source File
-SOURCE=.\signal\win32\signal.c
-# End Source File
-# Begin Source File
-
SOURCE=.\threadproc\win32\signals.c
# End Source File
# Begin Source File
@@ -260,7 +256,7 @@
# End Source File
# Begin Source File
-SOURCE=.\inc\apr_fnmatch.h
+SOURCE=.\include\apr_fnmatch.h
# End Source File
# Begin Source File
1.5 +644 -99 apache-2.0/src/lib/apr/aprlib.mak
Index: aprlib.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprlib.mak 1999/10/25 23:55:39 1.4
+++ aprlib.mak 1999/11/29 23:29:19 1.5
@@ -25,6 +25,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "aprlib - Win32 Release"
OUTDIR=.\Release
@@ -69,7 +73,6 @@
[EMAIL PROTECTED] "$(INTDIR)\readwrite.obj"
[EMAIL PROTECTED] "$(INTDIR)\seek.obj"
[EMAIL PROTECTED] "$(INTDIR)\sendrecv.obj"
- [EMAIL PROTECTED] "$(INTDIR)\signal.obj"
[EMAIL PROTECTED] "$(INTDIR)\signals.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockaddr.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockets.obj"
@@ -88,46 +91,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32"
/I\
"./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\aprlib.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 /o NUL /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprlib.bsc"
BSC32_SBRS= \
@@ -166,7 +135,6 @@
"$(INTDIR)\readwrite.obj" \
"$(INTDIR)\seek.obj" \
"$(INTDIR)\sendrecv.obj" \
- "$(INTDIR)\signal.obj" \
"$(INTDIR)\signals.obj" \
"$(INTDIR)\sockaddr.obj" \
"$(INTDIR)\sockets.obj" \
@@ -227,7 +195,6 @@
[EMAIL PROTECTED] "$(INTDIR)\readwrite.obj"
[EMAIL PROTECTED] "$(INTDIR)\seek.obj"
[EMAIL PROTECTED] "$(INTDIR)\sendrecv.obj"
- [EMAIL PROTECTED] "$(INTDIR)\signal.obj"
[EMAIL PROTECTED] "$(INTDIR)\signals.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockaddr.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockets.obj"
@@ -249,46 +216,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
"./misc/win32" /I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\aprlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
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 "_DEBUG" /mktyplib203 /o NUL /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprlib.bsc"
BSC32_SBRS= \
@@ -327,7 +260,6 @@
"$(INTDIR)\readwrite.obj" \
"$(INTDIR)\seek.obj" \
"$(INTDIR)\sendrecv.obj" \
- "$(INTDIR)\signal.obj" \
"$(INTDIR)\signals.obj" \
"$(INTDIR)\sockaddr.obj" \
"$(INTDIR)\sockets.obj" \
@@ -346,6 +278,36 @@
!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)" == "aprlib - Win32 Release" || "$(CFG)" == "aprlib - Win32
Debug"
SOURCE=.\time\win32\access.c
@@ -456,16 +418,15 @@
DEP_CPP_APR_F=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_fnmatch.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
+ ".\include\apr_fnmatch.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_APR_F=\
- ".\inc\apr_config.h"\
".\include\apr_config.h"\
".\lib\apr_config.h"\
@@ -478,9 +439,9 @@
DEP_CPP_APR_F=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_fnmatch.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
+ ".\include\apr_fnmatch.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
".\include\apr_win.h"\
@@ -578,12 +539,13 @@
DEP_CPP_APR_P=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
".\include\apr_lib.h"\
".\include\apr_lock.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
{$(INCLUDE)}"sys\stat.h"\
@@ -602,12 +564,13 @@
DEP_CPP_APR_P=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
".\include\apr_lib.h"\
".\include\apr_lock.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
@@ -671,6 +634,9 @@
!ENDIF
SOURCE=.\lib\apr_snprintf.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_SN=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -689,14 +655,35 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_SN=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_tables.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_T=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -710,17 +697,40 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_T=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+ ".\misc\win32\misc.h"\
+
+
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\dir.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_DIR_C=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
".\include\apr_lock.h"\
".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
".\include\apr_portable.h"\
".\include\apr_thread_proc.h"\
".\include\apr_time.h"\
@@ -736,15 +746,42 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_DIR_C=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\fileacc.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_FILEA=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -757,15 +794,37 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_FILEA=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\filedup.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_FILED=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -778,15 +837,37 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_FILED=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\filestat.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_FILES=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -799,11 +880,34 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_FILES=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\misc\win32\getopt.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_GETOP=\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -816,7 +920,27 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_GETOP=\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
+ ".\include\apr_win.h"\
+ ".\misc\win32\misc.h"\
+
+
+"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\locks\win32\locks.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_LOCKS=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -840,8 +964,34 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=.\misc\win32\names.c
-DEP_CPP_NAMES=\
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_LOCKS=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\locks\win32\locks.h"\
+
+
+"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=.\misc\win32\names.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
+DEP_CPP_NAMES=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
@@ -859,17 +1009,37 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_NAMES=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\open.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_OPEN_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
".\include\apr_lock.h"\
".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
".\include\apr_portable.h"\
".\include\apr_thread_proc.h"\
".\include\apr_time.h"\
@@ -885,15 +1055,42 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_OPEN_=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\pipe.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_PIPE_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -906,7 +1103,29 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_PIPE_=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\network_io\win32\poll.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_POLL_=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -926,17 +1145,39 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_POLL_=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_win.h"\
+ ".\network_io\win32\networkio.h"\
+
+
+"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\threadproc\win32\proc.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_PROC_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
".\include\apr_lock.h"\
".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
".\include\apr_portable.h"\
".\include\apr_thread_proc.h"\
".\include\apr_time.h"\
@@ -953,7 +1194,35 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_PROC_=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\threadproc\win32\threadproc.h"\
+
+
+"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\readdir.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_READD=\
".\file_io\win32\readdir.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -963,15 +1232,30 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_READD=\
+ ".\file_io\win32\readdir.h"\
+
+
+"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\readwrite.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_READW=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -984,15 +1268,37 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_READW=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\file_io\win32\seek.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_SEEK_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -1005,7 +1311,29 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SEEK_=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\network_io\win32\sendrecv.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_SENDR=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1025,48 +1353,76 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=.\signal\win32\signal.c
-DEP_CPP_SIGNA=\
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SENDR=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_network_io.h"\
".\include\apr_win.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_SIGNA=\
- ".\include\apr_config.h"\
+ ".\network_io\win32\networkio.h"\
-"$(INTDIR)\signal.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
+"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ENDIF
+
SOURCE=.\threadproc\win32\signals.c
-DEP_CPP_SIGNAL=\
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
+DEP_CPP_SIGNA=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_thread_proc.h"\
".\include\apr_win.h"\
".\threadproc\win32\threadproc.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SIGNAL=\
+NODEP_CPP_SIGNA=\
".\include\apr_config.h"\
-"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNAL) "$(INTDIR)"
+"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SIGNA=\
+ ".\file_io\win32\fileio.h"\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_win.h"\
+ ".\threadproc\win32\threadproc.h"\
+
+
+"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\network_io\win32\sockaddr.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_SOCKA=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1086,7 +1442,29 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SOCKA=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_win.h"\
+ ".\network_io\win32\networkio.h"\
+
+
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\network_io\win32\sockets.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_SOCKE=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1110,7 +1488,33 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SOCKE=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\network_io\win32\networkio.h"\
+
+
+"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\network_io\win32\sockopt.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_SOCKO=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1130,14 +1534,37 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_SOCKO=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_win.h"\
+ ".\network_io\win32\networkio.h"\
+
+
+"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\misc\win32\start.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_START=\
".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -1150,7 +1577,30 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_START=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_getopt.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_win.h"\
+ ".\misc\win32\misc.h"\
+
+
+"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\threadproc\win32\thread.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_THREA=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1174,7 +1624,33 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_THREA=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\threadproc\win32\threadproc.h"\
+
+
+"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\threadproc\win32\threadcancel.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_THREAD=\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
@@ -1192,7 +1668,27 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_THREAD=\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_win.h"\
+ ".\threadproc\win32\threadproc.h"\
+
+
+"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\threadproc\win32\threadpriv.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_THREADP=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1216,7 +1712,33 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_THREADP=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\threadproc\win32\threadproc.h"\
+
+
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\time\win32\time.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_TIME_=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1239,6 +1761,29 @@
"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_TIME_=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_portable.h"\
+ ".\include\apr_thread_proc.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\time\win32\atime.h"\
+
+
+"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
SOURCE=.\misc\win32\timetest.c
1.5 +2 -1 apache-2.0/src/lib/apr/misc/win32/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- misc.h 1999/11/20 22:05:19 1.4
+++ misc.h 1999/11/29 23:29:27 1.5
@@ -70,7 +70,8 @@
struct context_t {
struct ap_pool_t *pool;
- void *prog_data;
+ datastruct *prog_data;
+ int (*apr_abort)(int retcode);
};
#define WSAHighByte 2
1.10 +5 -2 apache-2.0/src/lib/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- start.c 1999/11/05 21:26:25 1.9
+++ start.c 1999/11/29 23:29:29 1.10
@@ -78,7 +78,7 @@
ap_pool_t *pool;
if (cont) {
- pool = ap_make_sub_pool(cont->pool);
+ pool = ap_make_sub_pool(cont->pool, cont->apr_abort);
}
else {
pool = ap_init_alloc();;
@@ -89,8 +89,10 @@
}
new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t));
+
new->pool = pool;
new->prog_data = NULL;
+ new->apr_abort = NULL;
iVersionRequested = MAKEWORD(WSAHighByte, WSALowByte);
err = WSAStartup((WORD) iVersionRequested, &wsaData);
@@ -198,6 +200,7 @@
/* This puts one thread in a Listen for signals mode */
ap_status_t ap_initialize(void)
{
+#if 0
unsigned tid;
if (_beginthreadex(NULL, 0, SignalHandling, NULL, 0, &tid) == 0) {
@@ -207,6 +210,6 @@
while (thread_ready() != 1) {
sleep(1);
}
-
+#endif
return APR_SUCCESS;
}
1.4 +38 -94 apache-2.0/src/main/gen_test_char.mak
Index: gen_test_char.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gen_test_char.mak 1999/10/07 14:13:11 1.3
+++ gen_test_char.mak 1999/11/29 23:29:32 1.4
@@ -28,6 +28,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "gen_test_char - Win32 Release"
OUTDIR=.
@@ -54,44 +57,11 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D\
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/Fp"$(INTDIR)\gen_test_char.pch"\
/YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\gen_test_char_R/
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) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_test_char.bsc"
BSC32_SBRS= \
@@ -152,44 +122,11 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /I\
"..\lib\apr\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
/Fp"$(INTDIR)\gen_test_char.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD
/c
CPP_OBJS=.\gen_test_char_D/
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) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_test_char.bsc"
BSC32_SBRS= \
@@ -223,45 +160,46 @@
!ENDIF
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\
- "gen_test_char - Win32 Debug"
-SOURCE=.\gen_test_char.c
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!IF "$(CFG)" == "gen_test_char - Win32 Release"
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-DEP_CPP_GEN_T=\
- "..\include\ap.h"\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_iol.h"\
- "..\include\ap_mmn.h"\
- "..\include\apr.h"\
- "..\include\buff.h"\
- "..\include\hsregex.h"\
- "..\include\httpd.h"\
- "..\include\util_uri.h"\
- "..\lib\apr\file_io\win32\readdir.h"\
- "..\lib\apr\include\apr_errno.h"\
- "..\lib\apr\include\apr_file_io.h"\
- "..\lib\apr\include\apr_general.h"\
- "..\lib\apr\include\apr_lib.h"\
- "..\lib\apr\include\apr_win.h"\
- "..\os\win32\os.h"\
-
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-"$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug"
+!IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\
+ "gen_test_char - Win32 Debug"
+SOURCE=.\gen_test_char.c
DEP_CPP_GEN_T=\
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
- "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -273,12 +211,18 @@
"..\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_GEN_T=\
+ "..\include\ap_config_auto.h"\
+ "..\include\ebcdic.h"\
+ "..\include\os.h"\
+ "..\lib\apr\include\apr_config.h"\
+
"$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
-
-!ENDIF
!ENDIF
1.3 +33 -66 apache-2.0/src/main/gen_uri_delims.mak
Index: gen_uri_delims.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/gen_uri_delims.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gen_uri_delims.mak 1999/10/07 14:13:11 1.2
+++ gen_uri_delims.mak 1999/11/29 23:29:34 1.3
@@ -29,6 +29,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "gen_uri_delims - Win32 Release"
OUTDIR=.
@@ -55,44 +58,11 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\gen_uri_delims.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
/FD /c
CPP_OBJS=.\gen_uri_delims_R/
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) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_uri_delims.bsc"
BSC32_SBRS= \
@@ -153,44 +123,11 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE"\
/D "_MBCS" /Fp"$(INTDIR)\gen_uri_delims.pch" /YX /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\gen_uri_delims_D/
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) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_uri_delims.bsc"
BSC32_SBRS= \
@@ -223,6 +160,36 @@
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!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)" == "gen_uri_delims - Win32 Release" || "$(CFG)" ==\
