You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/10/05 06:19:23 UTC

cvs commit: apache-2.0/src/lib/apr aprlib.def aprlib.mak aprlib.dsp

stoddard    99/10/04 21:19:23

  Modified:    src/lib/apr aprlib.mak aprlib.dsp
  Added:       src/lib/apr aprlib.def
  Log:
  Create the aprlib.dll exports file (aprlib.def) and update the project and make files to include it.
  
  Revision  Changes    Path
  1.3       +168 -315  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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aprlib.mak	1999/10/05 02:29:00	1.2
  +++ aprlib.mak	1999/10/05 04:19:21	1.3
  @@ -105,8 +105,10 @@
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
    odbccp32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no\
  - /pdb:"$(OUTDIR)\aprlib.pdb" /machine:I386 /out:"$(OUTDIR)\aprlib.dll"\
  - /implib:"$(OUTDIR)\aprlib.lib" 
  + /pdb:"$(OUTDIR)\aprlib.pdb" /machine:I386 /def:".\aprlib.def"\
  + /out:"$(OUTDIR)\aprlib.dll" /implib:"$(OUTDIR)\aprlib.lib" 
  +DEF_FILE= \
  +	".\aprlib.def"
   LINK32_OBJS= \
   	"$(INTDIR)\access.obj" \
   	"$(INTDIR)\apr_cpystrn.obj" \
  @@ -228,8 +230,10 @@
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
    odbccp32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:yes\
  - /pdb:"$(OUTDIR)\aprlib.pdb" /debug /machine:I386 /out:"$(OUTDIR)\aprlib.dll"\
  - /implib:"$(OUTDIR)\aprlib.lib" /pdbtype:sept 
  + /pdb:"$(OUTDIR)\aprlib.pdb" /debug /machine:I386 /def:".\aprlib.def"\
  + /out:"$(OUTDIR)\aprlib.dll" /implib:"$(OUTDIR)\aprlib.lib" /pdbtype:sept 
  +DEF_FILE= \
  +	".\aprlib.def"
   LINK32_OBJS= \
   	"$(INTDIR)\access.obj" \
   	"$(INTDIR)\apr_cpystrn.obj" \
  @@ -307,9 +311,6 @@
   
   !IF "$(CFG)" == "aprlib - Win32 Release" || "$(CFG)" == "aprlib - Win32 Debug"
   SOURCE=.\time\win32\access.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_ACCES=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -319,35 +320,17 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_ACCES=\
  -	".\file_io\win32\readdir.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_lib.h"\
  -	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  -	".\time\win32\atime.h"\
  +NODEP_CPP_ACCES=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_cpystrn.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_C=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -355,39 +338,27 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_APR_C=\
  -	".\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"\
  +NODEP_CPP_APR_C=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_execve.c
  +NODEP_CPP_APR_E=\
  +	".\lib\apr_config.h"\
  +	
   
   "$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=.\lib\apr_fnmatch.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_F=\
   	".\file_io\win32\readdir.h"\
   	".\inc\apr_fnmatch.h"\
  @@ -396,34 +367,19 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_APR_F=\
  -	".\file_io\win32\readdir.h"\
  -	".\inc\apr_fnmatch.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_lib.h"\
  -	".\include\apr_win.h"\
  +NODEP_CPP_APR_F=\
  +	".\inc\apr_config.h"\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_getpass.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_G=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -431,33 +387,18 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_APR_G=\
  -	".\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"\
  +NODEP_CPP_APR_G=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_md5.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_M=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -466,34 +407,18 @@
   	".\include\apr_lib.h"\
   	".\include\apr_md5.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_APR_M=\
  -	".\file_io\win32\readdir.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_lib.h"\
  -	".\include\apr_md5.h"\
  -	".\include\apr_win.h"\
  +NODEP_CPP_APR_M=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_pools.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_P=\
   	".\file_io\win32\readdir.h"\
   	".\inc\apr_pools.h"\
  @@ -504,36 +429,19 @@
   	".\include\apr_lock.h"\
   	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_lib.h"\
  -	".\include\apr_lock.h"\
  -	".\include\apr_win.h"\
  -	".\misc\win32\misc.h"\
  +NODEP_CPP_APR_P=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_slack.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_S=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -541,7 +449,16 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_S=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.h"\
  +	".\lib\http_log.h"\
   	
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
    "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
  @@ -555,14 +472,6 @@
   
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
  -DEP_CPP_APR_S=\
  -	".\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"\
  -	
   CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
    "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
  @@ -577,9 +486,6 @@
   !ENDIF 
   
   SOURCE=.\lib\apr_snprintf.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_APR_SN=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -587,33 +493,18 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
  -	$(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"\
  +NODEP_CPP_APR_SN=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.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"\
  @@ -623,35 +514,18 @@
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_lib.h"\
  -	".\include\apr_win.h"\
  -	".\misc\win32\misc.h"\
  +NODEP_CPP_APR_T=\
  +	".\include\apr_config.h"\
  +	".\lib\apr_config.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"\
  @@ -666,40 +540,18 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_portable.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  +NODEP_CPP_DIR_C=\
  +	".\include\apr_config.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"\
  @@ -709,35 +561,18 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_win.h"\
  +NODEP_CPP_FILEA=\
  +	".\include\apr_config.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"\
  @@ -747,35 +582,18 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_win.h"\
  +NODEP_CPP_FILED=\
  +	".\include\apr_config.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"\
  @@ -785,31 +603,17 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -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_win.h"\
  +NODEP_CPP_FILES=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\misc\win32\getopt.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
  @@ -820,7 +624,11 @@
   	".\include\apr_general.h"\
   	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_GETOP=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -859,6 +667,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\locks\win32\locks.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_LOCKS=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  @@ -899,6 +711,11 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_NAMES=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  @@ -940,7 +757,12 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_OPEN_=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -983,6 +805,11 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_PIPE_=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  @@ -1021,6 +848,10 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_POLL_=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  @@ -1065,7 +896,12 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_PROC_=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1097,14 +933,32 @@
   !ENDIF 
   
   SOURCE=.\file_io\win32\readdir.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_READD=\
  +	".\file_io\win32\readdir.h"\
  +	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
   DEP_CPP_READD=\
   	".\file_io\win32\readdir.h"\
  +	".\include\apr_win.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"
  @@ -1118,6 +972,11 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_READW=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  @@ -1156,7 +1015,12 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_SEEK_=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1194,6 +1058,10 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SENDR=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
  @@ -1230,6 +1098,10 @@
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SIGNA=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\signal.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  @@ -1268,7 +1140,12 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_SIGNAL=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNAL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1312,6 +1189,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SOCKE=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
  @@ -1354,7 +1235,11 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_SOCKO=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1392,6 +1277,10 @@
   	".\include\apr_lib.h"\
   	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_START=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
  @@ -1434,6 +1323,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_THREA=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
  @@ -1474,7 +1367,11 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_THREAD=\
  +	".\include\apr_config.h"\
  +	
   
   "$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1498,9 +1395,6 @@
   !ENDIF 
   
   SOURCE=.\threadproc\win32\threadpriv.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_THREADP=\
   	".\file_io\win32\readdir.h"\
   	".\include\apr_errno.h"\
  @@ -1514,39 +1408,17 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
  -	$(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"\
  +NODEP_CPP_THREADP=\
  +	".\include\apr_config.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"\
  @@ -1560,34 +1432,15 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(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"\
  +NODEP_CPP_TIME_=\
  +	".\include\apr_config.h"\
   	
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   SOURCE=.\misc\win32\timetest.c
   
  
  
  
  1.3       +4 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aprlib.dsp	1999/10/05 02:28:59	1.2
  +++ aprlib.dsp	1999/10/05 04:19:21	1.3
  @@ -132,6 +132,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\aprlib.def
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\file_io\win32\dir.c
   # End Source File
   # Begin Source File
  
  
  
  1.1                  apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  ; aprlib.def :
  
  LIBRARY aprlib
  DESCRIPTION ''
  
  EXPORTS
  	; Add new API calls to the end of this list.
  	ap_opendir   @1
  	ap_closedir   @2
  	ap_readdir   @3
  	ap_rewinddir   @4
  	ap_make_dir   @5
  	ap_remove_dir   @6
  	ap_dir_entry_size   @7
  	ap_dir_entry_mtime   @8
  	ap_dir_entry_ftype   @9
  	ap_get_dir_filename   @10
  	ap_get_filename   @11
  	ap_get_filesize   @12
  	ap_get_fileatime   @13
  	ap_get_filectime   @14
  	ap_get_filemtime   @15
  	ap_dupfile   @16
  	ap_getfileinfo   @17
  	ap_open   @18
  	ap_close   @19
  	ap_remove_file   @20
  	ap_create_pipe   @21
  	ap_read   @22
  	ap_write   @23
  	ap_seek   @24
      	ap_get_filedata   @25
      	ap_set_filedata   @26
      	ap_get_os_file   @27
  	ap_put_os_file @28
      	ap_get_os_dir   @29
      	ap_putc   @30
      	ap_getc   @31
  	ap_puts @32
  	ap_fgets @33
  	ap_flush @34
      	ap_fprintf   @35
      	ap_eof   @36
  	ap_get_filetype @37
  	ap_writev @38
  	; locks
  	ap_create_lock   @39
  	ap_lock   @40
  	ap_unlock   @41
  	ap_destroy_lock   @42
  	ap_child_init_lock   @43
  	ap_get_lockdata   @44
  	ap_set_lockdata   @45
  	ap_get_os_lock   @46
  	ap_create_tcp_socket   @47
  	ap_shutdown   @48
  	ap_close_socket   @49
  	ap_bind   @50
  	ap_listen   @51
  	ap_accept   @52
  	ap_connect   @53
  	ap_get_remote_hostname   @54
  	ap_gethostname   @55
  	ap_send   @56
  	ap_recv   @57
  	ap_setsocketopt   @58
  	ap_getport @59
  	ap_setport   @60
  	ap_setup_poll   @61
  	ap_poll   @62
  	ap_add_poll_socket   @63
  	ap_get_revents   @64
  	ap_get_socketdata   @65
  	ap_set_socketdata   @66
  	ap_get_polldata   @67
  	ap_set_polldata   @68
  	ap_put_os_sock @69
  	ap_get_os_sock   @70
  	ap_remove_poll_socket   @71
  	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_createprocattr_init   @80
  	ap_setprocattr_io   @81
  	ap_setprocattr_dir   @82
  	ap_setprocattr_cmdtype   @83
  	ap_setprocattr_detach   @84
  	ap_create_process   @85
  	ap_get_childin   @86
  	ap_get_childout   @87
  	ap_get_childerr   @88
  	ap_wait_proc   @89
  	ap_kill   @90
  	ap_create_threadattr   @91
  	ap_setthreadattr_detach   @92
  	ap_getthreadattr_detach   @93
  	ap_create_thread   @94
  	ap_thread_exit   @95
  	ap_thread_join   @96
  	ap_thread_detach   @97
  	ap_cancel_thread   @98
  	ap_create_thread_private   @99
  	ap_get_thread_private   @100
  	ap_set_thread_private   @101
  	ap_delete_thread_private   @102
  	ap_get_threaddata    @103
  	ap_set_threaddata    @104
  	ap_get_threadkeydata    @105
  	ap_set_threadkeydata    @106
  	ap_get_procdata    @107
  	ap_set_procdata    @108
  	ap_get_os_proc   @109
  	ap_get_os_thread   @110
  	ap_get_os_threadkey   @111
  	ap_os_systemcase_filename   @112
  	canonical_filename   @113
  	ap_create_context   @114
  	ap_destroy_context   @115
  	WinTimeToUnixTime   @116
  	ap_get_oslevel   @117
  	ap_get_userdata   @118
  	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_make_time   @127
  	ap_current_time   @128
  	ap_explode_time   @129
  	ap_implode_time   @130
  	ap_get_curtime   @131
  	ap_get_sec   @132
  	ap_get_min   @133
  	ap_get_hour   @134
  	ap_get_mday   @135
  	ap_get_mon   @136
  	ap_get_year   @137
  	ap_get_wday   @138
  	ap_set_sec   @139
  	ap_set_min   @140
  	ap_set_hour   @141
  	ap_set_mday   @142
  	ap_set_mon   @143
  	ap_set_year   @144
  	ap_set_wday   @145
  	ap_get_timedata   @146
  	ap_set_timedata   @147
  	ap_get_os_time   @148
  	ap_timediff   @149
  	ap_MD5Final   @150
  	ap_MD5Init   @151
  	ap_MD5Update   @152
  	ap_cpystrn   @153
  	ap_register_cleanup   @154
  	ap_kill_cleanup   @155
  	ap_fnmatch   @156
  	ap_is_fnmatch   @157
  	ap_MD5Encode   @158
  	ap_validate_password   @159
  	ap_make_sub_pool   @160
  	ap_init_alloc   @161
  	ap_clear_pool   @162
  	ap_destroy_pool   @163
  	ap_bytes_in_pool   @164
  	ap_bytes_in_free_blocks   @165
  	ap_palloc   @166
  	ap_pcalloc   @167
  	ap_pstrdup   @168
  	ap_pstrndup   @169
  	ap_pstrcat   @170
  	ap_pvsprintf   @171
  	ap_psprintf   @172
  	ap_make_array   @173
  	ap_push_array   @174
  	ap_array_cat   @175
  	ap_copy_array   @176
  	ap_copy_array_hdr   @177
  	ap_append_arrays   @178
  	ap_array_pstrcat   @179
  	ap_make_table   @180
  	ap_copy_table   @181
  	ap_clear_table   @182
  	ap_table_get   @183
  	ap_table_set   @184
  	ap_table_setn   @185
  	ap_table_unset   @186
  	ap_table_merge   @187
  	ap_table_mergen   @188
  	ap_table_add   @189
  	ap_table_addn   @190
  	ap_overlay_tables @191
  	ap_table_do   @192
  	ap_overlap_tables   @193
  	ap_run_cleanup   @194
  	ap_cleanup_for_exec   @195
  	ap_null_cleanup   @196
  	ap_note_subprocess   @197
  	ap_slack   @198
  	ap_vformatter   @199
  	ap_snprintf   @200
  	ap_vsnprintf   @201
  	ap_getpass   @202