stoddard    00/01/17 15:16:07

  Modified:    src      Apache.mak ApacheCore.mak
               src/lib/apr aprlib.dsp aprlib.mak
  Log:
  Update Windows project files to include new time an file_io specs.
  
  Revision  Changes    Path
  1.4       +39 -0     apache-2.0/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Apache.mak        1999/12/20 19:52:46     1.3
  +++ Apache.mak        2000/01/17 23:15:55     1.4
  @@ -168,6 +168,9 @@
   
   !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 
Debug"
   SOURCE=.\os\win32\main_win32.c
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
   DEP_CPP_MAIN_=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -189,6 +192,7 @@
        ".\lib\apr\include\apr_getopt.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        ".\os\win32\registry.h"\
  @@ -207,6 +211,41 @@
   "$(INTDIR)\main_win32.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +DEP_CPP_MAIN_=\
  +     ".\include\ap.h"\
  +     ".\include\ap_config.h"\
  +     ".\include\ap_ctype.h"\
  +     ".\include\ap_hooks.h"\
  +     ".\include\ap_iol.h"\
  +     ".\include\ap_mmn.h"\
  +     ".\include\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_main.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.h"\
  +     ".\lib\apr\include\apr_errno.h"\
  +     ".\lib\apr\include\apr_file_io.h"\
  +     ".\lib\apr\include\apr_general.h"\
  +     ".\lib\apr\include\apr_getopt.h"\
  +     ".\lib\apr\include\apr_lib.h"\
  +     ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     ".\os\win32\registry.h"\
  +     ".\os\win32\service.h"\
  +     
  +
  +"$(INTDIR)\main_win32.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   SOURCE=.\os\win32\apache.rc
   DEP_RSC_APACH=\
  
  
  
  1.12      +43 -0     apache-2.0/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheCore.mak    1999/12/20 19:52:47     1.11
  +++ ApacheCore.mak    2000/01/17 23:15:57     1.12
  @@ -451,6 +451,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\iol_socket.h"\
        ".\os\win32\os.h"\
  @@ -488,6 +489,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\iol_socket.h"\
        ".\os\win32\os.h"\
  @@ -520,6 +522,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -553,6 +556,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -953,6 +957,7 @@
        ".\lib\apr\include\apr_getopt.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -994,6 +999,7 @@
        ".\lib\apr\include\apr_getopt.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -1299,6 +1305,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -1333,6 +1340,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -1444,6 +1452,7 @@
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_network_io.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -1483,6 +1492,7 @@
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_network_io.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -1519,6 +1529,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -1558,6 +1569,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -1683,6 +1695,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -1720,6 +1733,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -2209,6 +2223,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -2246,6 +2261,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -2550,6 +2566,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -2588,6 +2605,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -2796,6 +2814,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -2833,6 +2852,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -2867,6 +2887,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -2904,6 +2925,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -2937,6 +2959,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -2973,6 +2996,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -3005,6 +3029,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -3040,6 +3065,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -3075,6 +3101,7 @@
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_network_io.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -3113,6 +3140,7 @@
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_network_io.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -3147,6 +3175,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        ".\os\win32\registry.h"\
  @@ -3186,6 +3215,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        ".\os\win32\registry.h"\
  @@ -3295,6 +3325,9 @@
        ".\include\ap_mmn.h"\
        ".\include\hsregex.h"\
        ".\include\util_date.h"\
  +     ".\lib\apr\include\apr_errno.h"\
  +     ".\lib\apr\include\apr_general.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -3304,6 +3337,7 @@
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
  +     ".\lib\apr\include\apr.h"\
        
   
   "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
  @@ -3318,6 +3352,10 @@
        ".\include\ap_mmn.h"\
        ".\include\hsregex.h"\
        ".\include\util_date.h"\
  +     ".\lib\apr\include\apr_errno.h"\
  +     ".\lib\apr\include\apr_general.h"\
  +     ".\lib\apr\include\apr_time.h"\
  +     ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
   
  @@ -3519,6 +3557,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\main\uri_delims.h"\
        ".\os\win32\os.h"\
  @@ -3555,6 +3594,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\main\uri_delims.h"\
        ".\os\win32\os.h"\
  @@ -3588,6 +3628,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
  @@ -3623,6 +3664,7 @@
        ".\lib\apr\include\apr_general.h"\
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
  +     ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        
  @@ -3719,6 +3761,7 @@
        ".\modules\mpm\winnt\mpm_default.h"\
        ".\os\win32\iol_socket.h"\
        ".\os\win32\os.h"\
  +     ".\os\win32\service.h"\
        
   
   "$(INTDIR)\winnt.obj"        "$(INTDIR)\winnt.sbr" : $(SOURCE) 
$(DEP_CPP_WINNT)\
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- aprlib.dsp        1999/11/29 23:29:15     1.5
  +++ aprlib.dsp        2000/01/17 23:16:00     1.6
  @@ -240,6 +240,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\time\win32\timestr.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\misc\win32\timetest.c
   # End Source File
   # End Group
  
  
  
  1.6       +214 -92   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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- aprlib.mak        1999/11/29 23:29:19     1.5
  +++ aprlib.mak        2000/01/17 23:16:02     1.6
  @@ -82,6 +82,7 @@
        [EMAIL PROTECTED] "$(INTDIR)\threadcancel.obj"
        [EMAIL PROTECTED] "$(INTDIR)\threadpriv.obj"
        [EMAIL PROTECTED] "$(INTDIR)\time.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\timestr.obj"
        [EMAIL PROTECTED] "$(INTDIR)\timetest.obj"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
        [EMAIL PROTECTED] "$(OUTDIR)\aprlib.dll"
  @@ -144,6 +145,7 @@
        "$(INTDIR)\threadcancel.obj" \
        "$(INTDIR)\threadpriv.obj" \
        "$(INTDIR)\time.obj" \
  +     "$(INTDIR)\timestr.obj" \
        "$(INTDIR)\timetest.obj"
   
   "$(OUTDIR)\aprlib.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -204,6 +206,7 @@
        [EMAIL PROTECTED] "$(INTDIR)\threadcancel.obj"
        [EMAIL PROTECTED] "$(INTDIR)\threadpriv.obj"
        [EMAIL PROTECTED] "$(INTDIR)\time.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\timestr.obj"
        [EMAIL PROTECTED] "$(INTDIR)\timetest.obj"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
  @@ -269,6 +272,7 @@
        "$(INTDIR)\threadcancel.obj" \
        "$(INTDIR)\threadpriv.obj" \
        "$(INTDIR)\time.obj" \
  +     "$(INTDIR)\timestr.obj" \
        "$(INTDIR)\timetest.obj"
   
   "$(OUTDIR)\aprlib.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -315,18 +319,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\time\win32\atime.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_ACCES=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
  @@ -336,13 +341,14 @@
   !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_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\time\win32\atime.h"\
        
   
  @@ -357,16 +363,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_C=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -377,12 +385,14 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
  @@ -417,17 +427,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_F=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_fnmatch.h"\
        ".\include\apr_general.h"\
        ".\include\apr_lib.h"\
  +     ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_F=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -438,12 +449,13 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_F=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_fnmatch.h"\
        ".\include\apr_general.h"\
        ".\include\apr_lib.h"\
  +     ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        
   
  @@ -458,16 +470,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_G=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -478,12 +492,14 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
  @@ -497,17 +513,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_M=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -518,12 +535,13 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        
   
  @@ -538,7 +556,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_P=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -546,13 +563,16 @@
        ".\include\apr_lib.h"\
        ".\include\apr_lock.h"\
        ".\include\apr_pools.h"\
  +     ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_P=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -563,7 +583,6 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_P=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -571,7 +590,10 @@
        ".\include\apr_lib.h"\
        ".\include\apr_lock.h"\
        ".\include\apr_pools.h"\
  +     ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        
   
  @@ -586,16 +608,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_S=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        ".\lib\http_log.h"\
        
  @@ -613,12 +637,14 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.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\
  @@ -638,16 +664,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_SN=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -658,12 +686,14 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
  @@ -677,19 +707,21 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_APR_T=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        ".\lib\apr_config.h"\
        
   
  @@ -700,14 +732,16 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        
   
  @@ -723,7 +757,6 @@
   
   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"\
  @@ -735,11 +768,12 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_DIR_C=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  @@ -750,7 +784,6 @@
   
   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"\
  @@ -762,6 +795,7 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  @@ -776,18 +810,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_FILEA=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
  @@ -798,13 +834,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
  @@ -819,18 +857,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_FILED=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  @@ -841,13 +881,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  @@ -862,18 +904,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_FILES=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  @@ -884,13 +928,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  @@ -908,12 +954,13 @@
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
        ".\include\apr_getopt.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\misc\win32\misc.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_GETOP=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
  @@ -927,6 +974,7 @@
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
        ".\include\apr_getopt.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\misc\win32\misc.h"\
        
  @@ -942,7 +990,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_LOCKS=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -957,7 +1004,7 @@
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_LOCKS=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  @@ -967,7 +1014,6 @@
   !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"\
  @@ -992,17 +1038,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_NAMES=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  @@ -1012,12 +1060,14 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  @@ -1032,7 +1082,6 @@
   
   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"\
  @@ -1044,11 +1093,12 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_OPEN_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
  @@ -1059,7 +1109,6 @@
   
   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"\
  @@ -1071,6 +1120,7 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
  @@ -1085,18 +1135,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_PIPE_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  @@ -1107,13 +1159,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  @@ -1127,18 +1181,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_POLL_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  @@ -1148,12 +1203,13 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        
  @@ -1170,7 +1226,6 @@
   
   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"\
  @@ -1182,12 +1237,13 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_PROC_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  @@ -1198,7 +1254,6 @@
   
   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"\
  @@ -1210,6 +1265,7 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        
   
  @@ -1250,18 +1306,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_READW=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  @@ -1272,13 +1330,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  @@ -1293,18 +1353,20 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SEEK_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  @@ -1315,13 +1377,15 @@
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  @@ -1335,18 +1399,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SENDR=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
  @@ -1356,12 +1421,13 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        
  @@ -1378,20 +1444,21 @@
   
   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_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SIGNA=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  @@ -1402,14 +1469,15 @@
   
   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_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        
   
  @@ -1424,18 +1492,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SOCKA=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
  @@ -1445,12 +1514,13 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        
  @@ -1466,7 +1536,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_SOCKE=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -1481,7 +1550,7 @@
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SOCKE=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
  @@ -1491,7 +1560,6 @@
   !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"\
  @@ -1516,18 +1584,19 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_SOCKO=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
  @@ -1537,12 +1606,13 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\network_io\win32\networkio.h"\
        
  @@ -1558,19 +1628,21 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_START=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
  @@ -1580,14 +1652,16 @@
   !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_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\misc\win32\misc.h"\
        
   
  @@ -1602,7 +1676,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_THREA=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -1613,11 +1686,12 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_THREA=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
  @@ -1627,7 +1701,6 @@
   !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"\
  @@ -1638,6 +1711,7 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\threadproc\win32\threadproc.h"\
        
   
  @@ -1656,12 +1730,13 @@
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
        ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\threadproc\win32\threadproc.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_THREAD=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
  @@ -1675,6 +1750,7 @@
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
        ".\include\apr_thread_proc.h"\
  +     ".\include\apr_time.h"\
        ".\include\apr_win.h"\
        ".\threadproc\win32\threadproc.h"\
        
  @@ -1690,7 +1766,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_THREADP=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -1705,7 +1780,7 @@
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_THREADP=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
  @@ -1715,7 +1790,6 @@
   !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"\
  @@ -1740,7 +1814,6 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_TIME_=\
  -     ".\file_io\win32\readdir.h"\
        ".\include\apr_errno.h"\
        ".\include\apr_file_io.h"\
        ".\include\apr_general.h"\
  @@ -1751,11 +1824,12 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\time\win32\atime.h"\
        {$(INCLUDE)}"sys\types.h"\
        
   NODEP_CPP_TIME_=\
  -     ".\include\apr_config.h"\
  +     ".\include\apr.h"\
        
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
  @@ -1765,7 +1839,6 @@
   !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"\
  @@ -1776,10 +1849,59 @@
        ".\include\apr_thread_proc.h"\
        ".\include\apr_time.h"\
        ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
        ".\time\win32\atime.h"\
        
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\time\win32\timestr.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_TIMES=\
  +     ".\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"\
  +     ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
  +     ".\time\win32\atime.h"\
  +     {$(INCLUDE)}"sys\types.h"\
  +     
  +NODEP_CPP_TIMES=\
  +     ".\include\apr.h"\
  +     
  +
  +"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_TIMES=\
  +     ".\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"\
  +     ".\include\apr_win.h"\
  +     ".\include\apr_winconfig.h"\
  +     ".\time\win32\atime.h"\
  +     
  +
  +"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  
  
  

Reply via email to