httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/time/win32 access.c atime.h
Date Tue, 04 Apr 2000 20:33:48 GMT
stoddard    00/04/04 13:33:48

  Modified:    src      CHANGES
               src/lib/apr aprlib.dsp aprlib.mak
               src/lib/apr/file_io/win32 dir.c fileio.h readwrite.c
               src/lib/apr/include apr_config.hw
               src/lib/apr/time/win32 access.c atime.h
  Log:
  Fix some of the Windows APR time functions.
  
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.55      +2 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- CHANGES	2000/04/04 17:06:14	1.54
  +++ CHANGES	2000/04/04 20:33:45	1.55
  @@ -1,4 +1,6 @@
   Changes with Apache 2.0a3-dev
  +  *) Fix some of the Windows APR time functions.
  +     [William Rowe]
   
     *) FAQ changes related to tidying up historical documents on the web site.
        [Joshua Slive <slive@finance.commerce.ubc.ca>]
  
  
  
  1.13      +2 -2      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- aprlib.dsp	2000/04/03 20:41:08	1.12
  +++ aprlib.dsp	2000/04/04 20:33:46	1.13
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  @@ -69,7 +69,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
/FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  
  
  
  1.13      +13 -506   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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- aprlib.mak	2000/04/03 20:41:09	1.12
  +++ aprlib.mak	2000/04/04 20:33:46	1.13
  @@ -89,8 +89,8 @@
   
   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" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  + "./file_io/win32" /I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -248,8 +248,8 @@
   
   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"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "./misc/win32" /I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D\
  + "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -639,8 +639,9 @@
   	".\lib\http_log.h"\
   	
   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" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "./misc/win32" /I "./file_io/win32" /I "./time/win32" /I "./misc/win32/" /I\
  + "./file_io/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   
   "$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) @<<
  @@ -661,8 +662,9 @@
   	".\include\apr_time.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" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "./misc/win32" /I "./file_io/win32" /I "./time/win32" /I "./misc/win32/" /I\
  + "./file_io/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   
   "$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
    ".\include\apr.h" ".\include\apr_config.h"
  @@ -777,6 +779,7 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  +	".\time\win32\atime.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  @@ -1012,27 +1015,14 @@
   
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
  -DEP_CPP_GETOP=\
  -	".\include\apr.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_getopt.h"\
  -	".\include\apr_time.h"\
  -	".\misc\win32\misc.h"\
  -	
   
  -"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  - ".\include\apr.h"
  +"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
   SOURCE=.\locks\win32\locks.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_LOCKS=\
   	".\include\apr.h"\
   	".\include\apr_errno.h"\
  @@ -1052,33 +1042,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_LOCKS=\
  -	".\include\apr.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"\
  -	".\locks\win32\locks.h"\
  -	
  -
  -"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  - ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\misc\win32\names.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_NAMES=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1096,30 +1060,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_NAMES=\
  -	".\include\apr.h"\
  -	".\include\apr_config.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_lib.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	
  -
  -"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\file_io\win32\open.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_OPEN_=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1142,35 +1083,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_OPEN_=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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"\
  -	
  -
  -"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"\
  - ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\file_io\win32\pipe.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_PIPE_=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1190,32 +1103,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_PIPE_=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_time.h"\
  -	
  -
  -"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"\
  - ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\network_io\win32\poll.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_POLL_=\
   	".\include\apr.h"\
   	".\include\apr_errno.h"\
  @@ -1233,30 +1121,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_POLL_=\
  -	".\include\apr.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_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\network_io\win32\networkio.h"\
  -	
  -
  -"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\threadproc\win32\proc.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_PROC_=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1280,36 +1145,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_PROC_=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"\
  - ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\file_io\win32\readwrite.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_READW=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1321,6 +1157,7 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  +	".\time\win32\atime.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  @@ -1329,32 +1166,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_READW=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_time.h"\
  -	
  -
  -"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\file_io\win32\seek.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SEEK_=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1374,32 +1186,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SEEK_=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_time.h"\
  -	
  -
  -"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"\
  - ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\network_io\win32\sendrecv.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SENDR=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1421,34 +1208,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SENDR=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_pools.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\network_io\win32\networkio.h"\
  -	
  -
  -"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\threadproc\win32\signals.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SIGNA=\
   	".\file_io\win32\fileio.h"\
   	".\include\apr.h"\
  @@ -1469,33 +1229,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SIGNA=\
  -	".\file_io\win32\fileio.h"\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\network_io\win32\sockaddr.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SOCKA=\
   	".\include\apr.h"\
   	".\include\apr_errno.h"\
  @@ -1513,31 +1247,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SOCKA=\
  -	".\include\apr.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_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\network_io\win32\networkio.h"\
  -	
  -
  -"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
  - ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\network_io\win32\sockets.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SOCKE=\
   	".\include\apr.h"\
   	".\include\apr_errno.h"\
  @@ -1557,33 +1267,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SOCKE=\
  -	".\include\apr.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"\
  -	".\network_io\win32\networkio.h"\
  -	
  -
  -"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
  - ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\network_io\win32\sockopt.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_SOCKO=\
   	".\include\apr.h"\
   	".\include\apr_errno.h"\
  @@ -1601,31 +1285,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_SOCKO=\
  -	".\include\apr.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_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\network_io\win32\networkio.h"\
  -	
  -
  -"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
  - ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\misc\win32\start.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_START=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1645,33 +1305,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_START=\
  -	".\include\apr.h"\
  -	".\include\apr_config.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_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\misc\win32\misc.h"\
  -	
  -
  -"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\threadproc\win32\thread.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_THREA=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1692,34 +1326,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_THREA=\
  -	".\include\apr.h"\
  -	".\include\apr_config.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"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\threadproc\win32\threadcancel.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_THREAD=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1736,30 +1343,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_THREAD=\
  -	".\include\apr.h"\
  -	".\include\apr_config.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\threadproc\win32\threadpriv.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_THREADP=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1780,34 +1364,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_THREADP=\
  -	".\include\apr.h"\
  -	".\include\apr_config.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"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\time\win32\time.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_TIME_=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1828,34 +1385,7 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_TIME_=\
  -	".\include\apr.h"\
  -	".\include\apr_config.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"\
  -	".\time\win32\atime.h"\
  -	
  -
  -"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"\
  - ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
   SOURCE=.\time\win32\timestr.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   DEP_CPP_TIMES=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
  @@ -1874,29 +1404,6 @@
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_TIMES=\
  -	".\include\apr.h"\
  -	".\include\apr_config.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_lock.h"\
  -	".\include\apr_network_io.h"\
  -	".\include\apr_portable.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\time\win32\atime.h"\
  -	
  -
  -"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  - ".\include\apr.h" ".\include\apr_config.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
   SOURCE=.\include\apr_config.hw
   
  
  
  
  1.18      +2 -1      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- dir.c	2000/04/03 19:44:35	1.17
  +++ dir.c	2000/04/04 20:33:46	1.18
  @@ -68,6 +68,7 @@
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
  +#include "atime.h"
   
   ap_status_t dir_cleanup(void *thedir)
   {
  @@ -167,7 +168,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_mtime(time_t *time, ap_dir_t *thedir)
  +ap_status_t ap_dir_entry_mtime(ap_time_t *time, ap_dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
           return APR_ENODIR;
  
  
  
  1.13      +3 -3      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- fileio.h	2000/04/03 18:40:38	1.12
  +++ fileio.h	2000/04/04 20:33:46	1.13
  @@ -107,9 +107,9 @@
       int append; 
       int eof_hit;
       off_t size;
  -    time_t atime;
  -    time_t mtime;
  -    time_t ctime;
  +    ap_time_t atime;
  +    ap_time_t mtime;
  +    ap_time_t ctime;
   };
   
   struct ap_dir_t {
  
  
  
  1.20      +1 -0      apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- readwrite.c	2000/04/03 19:44:37	1.19
  +++ readwrite.c	2000/04/04 20:33:46	1.20
  @@ -59,6 +59,7 @@
   #include "apr_errno.h"
   #include <malloc.h>
   #include <windows.h>
  +#include "atime.h"
   
   #define GetFilePointer(hfile) SetFilePointer(hfile,0,NULL, FILE_CURRENT)
   
  
  
  
  1.2       +0 -1      apache-2.0/src/lib/apr/include/apr_config.hw
  
  Index: apr_config.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.hw,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_config.hw	2000/04/03 18:40:39	1.1
  +++ apr_config.hw	2000/04/04 20:33:47	1.2
  @@ -153,7 +153,6 @@
    * only found in the windows version of APR.
    */
   
  -void FileTimeToAprTime(time_t *atime, FILETIME *ft);
   unsigned __stdcall SignalHandling(void *);
   int thread_ready(void);
   
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/time/win32/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/access.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- access.c	2000/03/31 08:36:31	1.7
  +++ access.c	2000/04/04 20:33:47	1.8
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -ap_status_t ap_get_curtime(struct atime_t *time, ap_int64_t *rv)
  +ap_status_t ap_get_curtime(struct atime_t *time, ap_time_t *rv)
   {
       if (time) {
           (*rv) = time->currtime;
  
  
  
  1.6       +3 -1      apache-2.0/src/lib/apr/time/win32/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/atime.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- atime.h	2000/04/03 18:40:42	1.5
  +++ atime.h	2000/04/04 20:33:47	1.6
  @@ -61,10 +61,12 @@
   
   struct atime_t {
       ap_context_t *cntxt;
  -    time_t currtime;
  +    ap_time_t currtime;
       SYSTEMTIME *explodedtime;
   };
       
  +void FileTimeToAprTime(ap_time_t *atime, FILETIME *ft);
  +void AprTimeToFileTime(LPFILETIME pft, ap_time_t t);
   
   #endif  /* ! ATIME_H */
   
  
  
  

Mime
View raw message