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/support htdigest.mak htpasswd.mak rotatelogs.mak
Date Mon, 03 Apr 2000 18:40:48 GMT
stoddard    00/04/03 11:40:48

  Modified:    src      Apache.mak ApacheCore.mak CHANGES
               src/ap   ap.mak
               src/include ap_ac_config.h
               src/lib/apr APRDesign aprlib.dsp aprlib.mak
               src/lib/apr/file_io/win32 dir.c fileio.h filestat.c open.c
               src/lib/apr/include apr_errno.h apr_general.h
               src/lib/apr/lib apr_cpystrn.c apr_getpass.c apr_pools.c
                        apr_slack.c apr_snprintf.c apr_tables.c
               src/lib/apr/misc/win32 names.c start.c
               src/lib/apr/threadproc/win32 thread.c threadproc.h
               src/lib/apr/time/win32 atime.h
               src/main gen_test_char.mak http_log.c
               src/os/win32 ApacheModuleAuthAnon.mak
                        ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
                        ApacheModuleExpires.mak ApacheModuleHeaders.mak
                        ApacheModuleInfo.mak ApacheModuleRewrite.mak
                        ApacheModuleSpeling.mak ApacheModuleStatus.mak
                        ApacheModuleUserTrack.mak
               src/os/win32/installer/installdll install.c install.mak
               src/support htdigest.mak htpasswd.mak rotatelogs.mak
  Added:       src/lib/apr/include apr.hw apr_config.hw
  Removed:     src/lib/apr/include apr_win.h apr_winconfig.h
  Log:
  Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).
  Now, apr.h and apr_config.h are generated from apr.hw and apr_config.hw
  at build time. At this point, the server will not compile on Windows because
  of the recent DSO commits. Fixing those next.
  
  Submitted by: Bill Rowe & Bill Stoddard
  
  Revision  Changes    Path
  1.6       +25 -97    apache-2.0/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Apache.mak	2000/03/21 01:32:40	1.5
  +++ Apache.mak	2000/04/03 18:40:34	1.6
  @@ -25,6 +25,9 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "Apache - Win32 Release"
   
   OUTDIR=.\ApacheR
  @@ -52,44 +55,11 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./include" /I "./lib/apr/include" /D\
    "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
    /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheR/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -RSC=rc.exe
   RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "NDEBUG" 
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  @@ -139,13 +109,32 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "./include" /I "./lib/apr/include"\
    /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
    /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheD/
   CPP_SBRS=.
  +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib\
  + user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo\
  + /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug\
  + /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
  +LINK32_OBJS= \
  +	"$(INTDIR)\apache.res" \
  +	"$(INTDIR)\main_win32.obj"
  +
  +"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
   
  +!ENDIF 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -176,34 +165,9 @@
      $(CPP_PROJ) $< 
   <<
   
  -RSC=rc.exe
  -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" 
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib\
  - user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo\
  - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug\
  - /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
  -LINK32_OBJS= \
  -	"$(INTDIR)\apache.res" \
  -	"$(INTDIR)\main_win32.obj"
  -
  -"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   
   !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_ac_config.h"\
   	".\include\ap_config.h"\
  @@ -218,6 +182,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -226,7 +191,6 @@
   	".\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"\
   	".\os\win32\registry.h"\
   	".\os\win32\service.h"\
  @@ -235,49 +199,13 @@
   	
   NODEP_CPP_MAIN_=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\main_win32.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  -
  -DEP_CPP_MAIN_=\
  -	".\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_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"\
  -	".\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.15      +122 -172  apache-2.0/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheCore.mak	2000/03/24 04:45:27	1.14
  +++ ApacheCore.mak	2000/04/03 18:40:34	1.15
  @@ -111,7 +111,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=lib\apr\Release\aprlib.lib  regex\release\regex.lib\
  +LINK32_FLAGS=lib\apr\Release\aprlib.lib regex\release\regex.lib\
    ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
    /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\
  @@ -337,7 +337,7 @@
   <<
   
   LINK32=link.exe
  -LINK32_FLAGS=lib\apr\debug\aprlib.lib regex\debug\regex.lib  ap\Debug\ap.lib\
  +LINK32_FLAGS=lib\apr\debug\aprlib.lib regex\debug\regex.lib ap\Debug\ap.lib\
    kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
    shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
    /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386\
  @@ -444,6 +444,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -451,16 +452,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_BUFF_=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
  @@ -480,6 +479,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -487,7 +487,6 @@
   	".\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"\
   	
   
  @@ -512,6 +511,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -519,16 +519,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_BUILD=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
  @@ -545,6 +543,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -552,7 +551,6 @@
   	".\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"\
   	
   
  @@ -583,6 +581,7 @@
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -592,16 +591,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
  @@ -626,6 +623,7 @@
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -635,7 +633,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -668,6 +665,7 @@
   	".\include\httpd.h"\
   	".\include\mpm_status.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -678,16 +676,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_C=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_connection.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
  @@ -713,6 +709,7 @@
   	".\include\httpd.h"\
   	".\include\mpm_status.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -723,7 +720,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -760,6 +756,7 @@
   	".\include\rfc1413.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -771,16 +768,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_CO=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
  @@ -810,6 +805,7 @@
   	".\include\rfc1413.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -821,7 +817,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -851,6 +846,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -860,17 +856,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_L=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
  -	".\main\apr.h"\
   	
   
   "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
  @@ -893,6 +886,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -902,7 +896,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -932,6 +925,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -940,16 +934,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_M=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	".\main\xmlparse.h"\
   	
   
  @@ -973,6 +965,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -981,7 +974,6 @@
   	".\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"\
   	
   
  @@ -1016,6 +1008,7 @@
   	".\include\mpm_status.h"\
   	".\include\util_date.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1026,16 +1019,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_P=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
  @@ -1063,6 +1054,7 @@
   	".\include\mpm_status.h"\
   	".\include\util_date.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1073,7 +1065,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1105,6 +1096,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -1116,16 +1108,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_R=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  @@ -1150,6 +1140,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -1161,7 +1152,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1192,6 +1182,7 @@
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1202,16 +1193,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTTP_V=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
  @@ -1235,6 +1224,7 @@
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1245,7 +1235,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1270,6 +1259,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1277,16 +1267,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_IOL_F=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\iol_file.obj" : $(SOURCE) $(DEP_CPP_IOL_F) "$(INTDIR)"
  @@ -1304,6 +1292,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1311,7 +1300,6 @@
   	".\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"\
   	
   
  @@ -1333,6 +1321,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1342,14 +1331,10 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  -NODEP_CPP_IOL_S=\
  -	".\lib\apr\include\apr.h"\
  -	
   
   "$(INTDIR)\iol_socket.obj" : $(SOURCE) $(DEP_CPP_IOL_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1364,6 +1349,7 @@
   	".\include\hsregex.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1373,7 +1359,6 @@
   	".\lib\apr\include\apr_portable.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"\
   	
  @@ -1403,6 +1388,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1410,16 +1396,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_LISTE=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)"
  @@ -1441,6 +1425,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1448,7 +1433,6 @@
   	".\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"\
   	
   
  @@ -1478,6 +1462,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1485,16 +1470,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_A=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  @@ -1517,6 +1500,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1524,7 +1508,6 @@
   	".\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"\
   	
   
  @@ -1557,6 +1540,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1567,16 +1551,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_AC=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  @@ -1602,6 +1584,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1612,7 +1595,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1640,6 +1622,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1647,16 +1630,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_AL=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  @@ -1677,6 +1658,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1684,7 +1666,6 @@
   	".\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"\
   	
   
  @@ -1716,6 +1697,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1726,16 +1708,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_AS=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  @@ -1760,6 +1740,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1770,7 +1751,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1801,6 +1781,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1812,16 +1793,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_AU=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
  @@ -1845,6 +1824,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1856,7 +1836,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1889,6 +1868,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -1900,16 +1880,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_AUT=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  @@ -1935,6 +1913,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_fnmatch.h"\
  @@ -1946,7 +1925,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -1980,6 +1958,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -1990,16 +1969,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_C=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  @@ -2026,6 +2003,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2036,7 +2014,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2069,6 +2046,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2079,16 +2057,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_D=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  @@ -2114,6 +2090,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2124,7 +2101,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2152,6 +2128,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2159,16 +2136,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_E=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  @@ -2189,6 +2164,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2196,7 +2172,6 @@
   	".\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"\
   	
   
  @@ -2229,6 +2204,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2239,16 +2215,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_I=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  @@ -2274,6 +2248,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2284,7 +2259,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2317,6 +2291,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2327,16 +2302,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_IN=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	".\modules\standard\config.h"\
   	".\modules\standard\modules\perl\mod_perl.h"\
   	
  @@ -2364,6 +2337,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2374,7 +2348,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2404,6 +2377,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2414,16 +2388,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_L=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  @@ -2446,6 +2418,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2456,7 +2429,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2485,6 +2457,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2492,16 +2465,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_M=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
  @@ -2523,6 +2494,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2530,7 +2502,6 @@
   	".\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"\
   	
   
  @@ -2562,6 +2533,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2572,16 +2544,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_N=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  @@ -2606,6 +2576,7 @@
   	".\include\httpd.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2616,7 +2587,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2646,6 +2616,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2656,16 +2627,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_S=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  @@ -2688,6 +2657,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2698,7 +2668,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -2726,6 +2695,8 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
  +	".\lib\apr\include\apr_dso.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2733,16 +2704,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_SO=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
  @@ -2763,6 +2732,8 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
  +	".\lib\apr\include\apr_dso.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2770,7 +2741,6 @@
   	".\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"\
   	
   
  @@ -2798,6 +2768,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2805,16 +2776,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_U=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  @@ -2835,6 +2804,7 @@
   	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2842,7 +2812,6 @@
   	".\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"\
   	
   
  @@ -2866,6 +2835,7 @@
   	".\include\http_config.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2873,13 +2843,9 @@
   	".\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\types.h"\
   	
  -NODEP_CPP_MODUL=\
  -	".\lib\apr\include\apr.h"\
  -	
   
   "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -2896,6 +2862,7 @@
   	".\include\http_config.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2903,7 +2870,6 @@
   	".\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"\
   	
   
  @@ -2926,6 +2892,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2933,13 +2900,9 @@
   	".\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\types.h"\
   	
  -NODEP_CPP_REGIS=\
  -	".\lib\apr\include\apr.h"\
  -	
   
   "$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -2955,6 +2918,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2962,7 +2926,6 @@
   	".\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"\
   	
   
  @@ -2990,6 +2953,7 @@
   	".\include\httpd.h"\
   	".\include\rfc1413.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -2997,16 +2961,14 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_RFC14=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
  @@ -3027,6 +2989,7 @@
   	".\include\httpd.h"\
   	".\include\rfc1413.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3034,7 +2997,6 @@
   	".\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"\
   	
   
  @@ -3059,6 +3021,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3066,15 +3029,11 @@
   	".\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"\
   	".\os\win32\registry.h"\
   	".\os\win32\service.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  -NODEP_CPP_SERVI=\
  -	".\lib\apr\include\apr.h"\
  -	
   
   "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -3092,6 +3051,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3099,7 +3059,6 @@
   	".\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"\
   	".\os\win32\registry.h"\
   	".\os\win32\service.h"\
  @@ -3131,6 +3090,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3141,7 +3101,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\main\test_char.h"\
   	".\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -3149,9 +3108,8 @@
   	
   NODEP_CPP_UTIL_=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
  @@ -3174,6 +3132,7 @@
   	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3184,7 +3143,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\main\test_char.h"\
   	".\os\win32\os.h"\
   	
  @@ -3207,19 +3165,18 @@
   	".\include\ap_mmn.h"\
   	".\include\hsregex.h"\
   	".\include\util_date.h"\
  +	".\lib\apr\include\apr.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_UTIL_D=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
  @@ -3234,10 +3191,10 @@
   	".\include\ap_mmn.h"\
   	".\include\hsregex.h"\
   	".\include\util_date.h"\
  +	".\lib\apr\include\apr.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"\
   	
   
  @@ -3264,6 +3221,7 @@
   	".\include\httpd.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3273,16 +3231,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_UTIL_M=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
  @@ -3302,6 +3258,7 @@
   	".\include\httpd.h"\
   	".\include\util_md5.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3311,7 +3268,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -3345,6 +3301,7 @@
   	".\include\util_date.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3355,16 +3312,14 @@
   	".\lib\apr\include\apr_portable.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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_UTIL_S=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
  @@ -3391,6 +3346,7 @@
   	".\include\util_date.h"\
   	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3401,7 +3357,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\os\win32\os.h"\
   	
   
  @@ -3427,6 +3382,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3434,7 +3390,6 @@
   	".\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"\
   	".\main\uri_delims.h"\
   	".\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -3442,9 +3397,8 @@
   	
   NODEP_CPP_UTIL_U=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
  @@ -3463,6 +3417,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3470,7 +3425,6 @@
   	".\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"\
   	".\main\uri_delims.h"\
   	".\os\win32\os.h"\
   	
  @@ -3494,6 +3448,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3501,14 +3456,10 @@
   	".\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  -NODEP_CPP_UTIL_W=\
  -	".\lib\apr\include\apr.h"\
  -	
   
   "$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -3524,6 +3475,7 @@
   	".\include\http_log.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3531,7 +3483,6 @@
   	".\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"\
   	
   
  @@ -3564,6 +3515,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3573,7 +3525,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\modules\mpm\winnt\mpm_default.h"\
   	".\os\win32\iol_socket.h"\
   	".\os\win32\os.h"\
  @@ -3583,9 +3534,8 @@
   	
   NODEP_CPP_WINNT=\
   	".\include\ap_config_auto.h"\
  +	".\include\ap_config_path.h"\
   	".\include\ap_config_win32.h"\
  -	".\include\apr.h"\
  -	".\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\winnt.obj" : $(SOURCE) $(DEP_CPP_WINNT) "$(INTDIR)"
  @@ -3611,6 +3561,7 @@
   	".\include\http_main.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  +	".\lib\apr\include\apr.h"\
   	".\lib\apr\include\apr_errno.h"\
   	".\lib\apr\include\apr_file_io.h"\
   	".\lib\apr\include\apr_general.h"\
  @@ -3620,7 +3571,6 @@
   	".\lib\apr\include\apr_portable.h"\
   	".\lib\apr\include\apr_thread_proc.h"\
   	".\lib\apr\include\apr_time.h"\
  -	".\lib\apr\include\apr_win.h"\
   	".\modules\mpm\winnt\mpm_default.h"\
   	".\os\win32\iol_socket.h"\
   	".\os\win32\os.h"\
  
  
  
  1.52      +6 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- CHANGES	2000/04/03 16:03:13	1.51
  +++ CHANGES	2000/04/03 18:40:35	1.52
  @@ -1,4 +1,10 @@
   Changes with Apache 2.0a3-dev
  +  *) Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).
  +     Now, apr.h and apr_config.h are generated from apr.hw and apr_config.hw
  +     at build time. At this point, the server will not compile on Windows because
  +     of the recent DSO commits. Fixing those next.
  +     [Bill Rowe & Bill Stoddard]
  +
     *) Added error checking for file I/O APR routines.
        [Jon Travis <jtravis@covalent.net>]
   
  
  
  
  1.10      +9 -12     apache-2.0/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap.mak	2000/03/21 23:26:31	1.9
  +++ ap.mak	2000/04/03 18:40:36	1.10
  @@ -170,18 +170,17 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_BA=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\lib\apr\include\apr.h"\
   	".\ebcdic.h"\
   	
   
  @@ -196,9 +195,9 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	
   
  @@ -222,6 +221,7 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -229,16 +229,14 @@
   	"..\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_HO=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
  @@ -256,6 +254,7 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -263,7 +262,6 @@
   	"..\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"\
   	
   
  @@ -288,6 +286,7 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -295,16 +294,14 @@
   	"..\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_SH=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\lib\apr\include\apr.h"\
   	".\ebcdic.h"\
   	
   
  @@ -324,6 +321,7 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -331,7 +329,6 @@
   	"..\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"\
   	
   
  
  
  
  1.12      +1 -3      apache-2.0/src/include/ap_ac_config.h
  
  Index: ap_ac_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ap_ac_config.h	2000/03/31 07:18:48	1.11
  +++ ap_ac_config.h	2000/04/03 18:40:36	1.12
  @@ -64,14 +64,12 @@
   #ifdef WIN32
   #include "ap_config_win32.h"
   #include "../os/win32/os.h"
  -#include "apr_win.h"
   #else
   #include "ap_config_auto.h"
   #include "ap_config_path.h"
   #include "os.h"
  -#include "apr.h"
   #endif /* WIN32 */
  -
  +#include "apr.h"
   #ifdef STDC_HEADERS
   #include <stdlib.h>
   #include <string.h>
  
  
  
  1.7       +6 -7      apache-2.0/src/lib/apr/APRDesign
  
  Index: APRDesign
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/APRDesign,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- APRDesign	2000/04/03 17:14:02	1.6
  +++ APRDesign	2000/04/03 18:40:36	1.7
  @@ -21,12 +21,11 @@
   
   APR On Windows
   
  -I am putting this at the top because it is an important topic.  APR on Windows
  -is different from APR on all other systems, because it doesn't use autoconf.
  -As far as I know there is no autoconf for Windows, so we don't have much of a
  -choice in this.  Because autoconf is generating our apr_config.h file we need
  -to take care when adding macros to it.  There is an apr_win.h file which replaces
  -apr_config.h on Windows, and it needs to be kept up to date.
  +APR on Windows is different from APR on all other systems, because it
  +doesn't use autoconf. On Unix, apr_config.h (private to APR) and apr.h 
  +(public, used by applications that use APR) are generated by autoconf 
  +from acconfig.h and apr.h.in respectively. On Windows, apr_config.h 
  +and apr.h are created from apr_config.hw and apr.hw respectively.
   
   !!!***  If you add code to acconfig.h or tests to configure.in or aclocal.m4,
           please give some thought to whether or not Windows needs this addition
  @@ -36,7 +35,7 @@
           needs it.
           
           The only time it is safe to add a macro or test without also adding 
  -        the macro to apr_win.h, is if the macro tells APR how to build.  For
  +        the macro to apr*.hw, is if the macro tells APR how to build.  For
           example, a test for a header file does not need to be added to Windows.
   ***!!!
   
  
  
  
  1.10      +60 -4     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- aprlib.dsp	2000/03/28 21:22:17	1.9
  +++ aprlib.dsp	2000/04/03 18:40:36	1.10
  @@ -306,10 +306,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\include\apr_win.h
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\time\win32\atime.h
   # End Source File
   # Begin Source File
  @@ -327,6 +323,66 @@
   # Begin Source File
   
   SOURCE=.\threadproc\win32\threadproc.h
  +# End Source File
  +# End Group
  +# Begin Group "Generated Header Files"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\apr.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_config.h
  +# End Source File
  +# End Group
  +# Begin Group "Internal Header Files"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\apr_config.hw
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\apr_config.hw
  +
  +".\include\apr_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr_config.hw .\include\apr_config.h 
  +	echo Created apr_config.h from apr_config.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# End Group
  +# Begin Group "External Header Files"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\apr.hw
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\apr.hw
  +
  +".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr.hw .\include\apr.h > nul 
  +	echo Created apr.h from apr.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
   # End Source File
   # End Group
   # End Target
  
  
  
  1.10      +294 -145  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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- aprlib.mak	2000/03/28 21:22:18	1.9
  +++ aprlib.mak	2000/04/03 18:40:36	1.10
  @@ -316,15 +316,16 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_ACCES=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
  @@ -334,18 +335,19 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_ACCES=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\time\win32\atime.h"\
   	
   
  -"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
  +"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -356,14 +358,15 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_C=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
  @@ -373,17 +376,18 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_C=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	
   
  -"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
  +"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -391,15 +395,33 @@
   
   SOURCE=.\lib\apr_execve.c
   
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_APR_E=\
  +	".\include\apr_config.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\apr_execve.obj" : $(SOURCE) $(DEP_CPP_APR_E) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +
   "$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ENDIF 
  +
   SOURCE=.\lib\apr_fnmatch.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_F=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_fnmatch.h"\
  @@ -407,7 +429,7 @@
   	".\include\apr_lib.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
  @@ -417,6 +439,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_F=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_fnmatch.h"\
  @@ -424,10 +447,10 @@
   	".\include\apr_lib.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	
   
  -"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
  +"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -438,14 +461,15 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_G=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
  @@ -455,17 +479,18 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_G=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	
   
  -"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
  +"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -476,6 +501,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_M=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -483,7 +510,7 @@
   	".\include\apr_md5.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
  @@ -493,6 +520,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_M=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -500,10 +528,10 @@
   	".\include\apr_md5.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	
   
  -"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
  +"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -514,6 +542,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_P=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -523,9 +553,9 @@
   	".\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"\
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
  @@ -535,6 +565,8 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_P=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -544,12 +576,11 @@
   	".\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"\
   	
   
  -"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
  +"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -560,14 +591,18 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_S=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_S=\
  +	".\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\
  @@ -582,20 +617,21 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_S=\
  +	".\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"\
  -	".\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\
    "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   
  -"$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
  +"$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) @<<
     $(CPP_SWITCHES) $(SOURCE)
   <<
  @@ -608,14 +644,15 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_SN=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
  @@ -625,17 +662,18 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_SN=\
  +	".\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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	
   
  -"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
  +"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -646,6 +684,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_APR_T=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -654,9 +694,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
  @@ -666,6 +705,8 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_APR_T=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -674,12 +715,11 @@
   	".\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"\
   	
   
  -"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
  +"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -691,6 +731,8 @@
   
   DEP_CPP_DIR_C=\
   	".\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"\
  @@ -701,8 +743,8 @@
   	".\include\apr_portable.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"\
   	
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  @@ -713,6 +755,8 @@
   
   DEP_CPP_DIR_C=\
   	".\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"\
  @@ -723,11 +767,10 @@
   	".\include\apr_portable.h"\
   	".\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)"
  +"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -739,6 +782,8 @@
   
   DEP_CPP_FILEA=\
   	".\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"\
  @@ -746,8 +791,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
  @@ -758,6 +803,8 @@
   
   DEP_CPP_FILEA=\
   	".\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"\
  @@ -765,11 +812,10 @@
   	".\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)"
  +"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -781,6 +827,8 @@
   
   DEP_CPP_FILED=\
   	".\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"\
  @@ -788,8 +836,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  @@ -800,6 +848,8 @@
   
   DEP_CPP_FILED=\
   	".\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"\
  @@ -807,11 +857,10 @@
   	".\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)"
  +"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -823,6 +872,8 @@
   
   DEP_CPP_FILES=\
   	".\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"\
  @@ -830,8 +881,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  @@ -842,6 +893,8 @@
   
   DEP_CPP_FILES=\
   	".\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"\
  @@ -849,11 +902,10 @@
   	".\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)"
  +"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -864,13 +916,14 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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"\
  -	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
  @@ -880,16 +933,17 @@
   !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"\
  -	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
   	
   
  -"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
  +"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -900,6 +954,7 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_LOCKS=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -909,8 +964,8 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\locks\win32\locks.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  @@ -920,6 +975,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_LOCKS=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -929,11 +985,11 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\locks\win32\locks.h"\
   	
   
  -"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  +"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -944,14 +1000,16 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  @@ -961,17 +1019,18 @@
   !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"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	
   
  -"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  +"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -983,6 +1042,8 @@
   
   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"\
  @@ -993,8 +1054,8 @@
   	".\include\apr_portable.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"\
   	
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
  @@ -1005,6 +1066,8 @@
   
   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"\
  @@ -1015,11 +1078,10 @@
   	".\include\apr_portable.h"\
   	".\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)"
  +"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1031,6 +1093,8 @@
   
   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"\
  @@ -1038,8 +1102,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  @@ -1050,6 +1114,8 @@
   
   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"\
  @@ -1057,11 +1123,10 @@
   	".\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)"
  +"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1072,6 +1137,7 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_POLL_=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1079,8 +1145,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  @@ -1090,6 +1156,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_POLL_=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1097,11 +1164,10 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  +"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1113,6 +1179,8 @@
   
   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"\
  @@ -1123,9 +1191,9 @@
   	".\include\apr_portable.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"\
   	
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  @@ -1136,6 +1204,8 @@
   
   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"\
  @@ -1146,32 +1216,49 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  +"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
   SOURCE=.\file_io\win32\readdir.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_READD=\
   	".\file_io\win32\readdir.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(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"\
  +	
  +
  +"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\file_io\win32\readwrite.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_READW=\
   	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1179,8 +1266,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  @@ -1191,6 +1278,8 @@
   
   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"\
  @@ -1198,11 +1287,10 @@
   	".\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)"
  +"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1214,6 +1302,8 @@
   
   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"\
  @@ -1221,8 +1311,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  @@ -1233,6 +1323,8 @@
   
   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"\
  @@ -1240,11 +1332,10 @@
   	".\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)"
  +"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1256,6 +1347,8 @@
   
   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"\
  @@ -1264,9 +1357,9 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
  @@ -1277,6 +1370,8 @@
   
   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"\
  @@ -1285,12 +1380,11 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
  +"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1302,6 +1396,8 @@
   
   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"\
  @@ -1309,9 +1405,9 @@
   	".\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"\
   	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  @@ -1322,6 +1418,8 @@
   
   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"\
  @@ -1329,12 +1427,11 @@
   	".\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"\
   	
   
  -"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  +"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1345,6 +1442,7 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_SOCKA=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1352,8 +1450,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
  @@ -1363,6 +1461,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_SOCKA=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1370,11 +1469,11 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
  +"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1385,6 +1484,7 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_SOCKE=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1394,8 +1494,8 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
  @@ -1405,6 +1505,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_SOCKE=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1414,11 +1515,11 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
  +"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1429,6 +1530,7 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_SOCKO=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1436,8 +1538,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
  @@ -1447,6 +1549,7 @@
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   DEP_CPP_SOCKO=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1454,11 +1557,11 @@
   	".\include\apr_network_io.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
  +"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1469,6 +1572,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_START=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1477,9 +1582,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
  @@ -1489,6 +1593,8 @@
   !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"\
  @@ -1497,12 +1603,11 @@
   	".\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"\
   	
   
  -"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
  +"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1513,6 +1618,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_THREA=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1522,9 +1629,8 @@
   	".\include\apr_portable.h"\
   	".\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"\
   	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
  @@ -1534,6 +1640,8 @@
   !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"\
  @@ -1543,12 +1651,11 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
  -	".\include\apr_winconfig.h"\
   	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
  +"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1559,13 +1666,15 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   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"\
  -	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
  @@ -1575,16 +1684,18 @@
   !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"\
  -	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
  +"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1595,6 +1706,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_THREADP=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1604,8 +1717,8 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
  @@ -1615,6 +1728,8 @@
   !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"\
  @@ -1624,11 +1739,11 @@
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
  +"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1639,6 +1754,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_TIME_=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1648,9 +1765,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
  @@ -1660,6 +1776,8 @@
   !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"\
  @@ -1669,12 +1787,11 @@
   	".\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)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
  +"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1685,6 +1802,8 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_TIMES=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -1693,9 +1812,8 @@
   	".\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"\
   	
   
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
  @@ -1705,6 +1823,8 @@
   !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"\
  @@ -1713,14 +1833,43 @@
   	".\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)"
  +"$(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
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +InputPath=.\include\apr_config.hw
  +
  +".\include\apr_config.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr_config.hw .\include\apr_config.h 
  +	echo Created apr_config.h from apr_config.hw 
  +	
  +
  +!ENDIF 
  +
  +SOURCE=.\include\apr.hw
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +InputPath=.\include\apr.hw
  +
  +".\include\apr.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr.hw .\include\apr.h > nul 
  +	echo Created apr.h from apr.hw 
  +	
   
   !ENDIF 
   
  
  
  
  1.16      +0 -4      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- dir.c	2000/04/03 18:37:03	1.15
  +++ dir.c	2000/04/03 18:40:38	1.16
  @@ -64,10 +64,6 @@
   #ifdef HAVE_SYS_STAT_H
   #include <sys/stat.h>
   #endif
  -#ifdef WIN32
  -#include "apr_winconfig.h"
  -#include <windows.h>
  -#endif
   #include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- fileio.h	2000/04/03 18:37:03	1.11
  +++ fileio.h	2000/04/03 18:40:38	1.12
  @@ -76,7 +76,7 @@
   #ifdef HAVE_UIO_H
   #include <sys/uio.h>
   #endif
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "apr_pools.h"
   #include "apr_general.h"
   #include "apr_file_io.h"
  
  
  
  1.10      +1 -1      apache-2.0/src/lib/apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- filestat.c	2000/04/03 17:14:10	1.9
  +++ filestat.c	2000/04/03 18:40:38	1.10
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.26      +1 -3      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- open.c	2000/04/03 17:14:10	1.25
  +++ open.c	2000/04/03 18:40:38	1.26
  @@ -52,9 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#ifdef WIN32
  -#include "apr_winconfig.h"
  -#endif
  +#include "apr_config.h"
   #include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.19      +0 -4      apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- apr_errno.h	2000/04/03 16:03:16	1.18
  +++ apr_errno.h	2000/04/03 18:40:39	1.19
  @@ -53,11 +53,7 @@
    */
   
   #include <errno.h>
  -#if WIN32
  -#include "apr_win.h"
  -#else
   #include "apr.h"
  -#endif
   
   #ifndef APR_ERRNO_H
   #define APR_ERRNO_H
  
  
  
  1.22      +0 -4      apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_general.h	2000/04/03 18:37:06	1.21
  +++ apr_general.h	2000/04/03 18:40:39	1.22
  @@ -55,11 +55,7 @@
   #ifndef APR_GENERAL_H
   #define APR_GENERAL_H
   
  -#ifdef WIN32
  -#include "apr_win.h"
  -#else
   #include "apr.h"
  -#endif
   
   #if APR_HAVE_STDIO_H
   #include <stdio.h>
  
  
  
  1.1                  apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  /* 
   * Note: This is a Windows specific version of apr.h. It is renamed to
   * apr.h at the start of a Windows build.
   */
  
  #ifdef WIN32
  #ifndef APR_H
  #define APR_H
  
  #ifndef WIN32_LEAN_AND_MEAN
  #define WIN32_LEAN_AND_MEAN
  #endif
  #ifndef _WIN32_WINNT
  /* 
   * Compile the server including all the Windows NT 4.0 header files by 
   * default.
   */
  #define _WIN32_WINNT 0x0400
  #endif
  #include <windows.h>
  #include <winsock2.h>
  #include <mswsock.h>
  #include <sys/types.h>
  #include <stddef.h>
  #include <stdio.h>
  #include <time.h>
  #include <process.h>
  #include <signal.h>
  
  #define ap_inline
  #define __attribute__(__x)
  #define ENUM_BITFIELD(e,n,w)  signed int n : w
  
  #define APR_HAVE_ERRNO_H        1
  #define APR_HAVE_DIRENT_H       0
  #define APR_HAVE_FCNTL_H        0
  #define APR_HAVE_NETINET_IN_H   0
  #define APR_HAVE_PTHREAD_H      0
  #define APR_HAVE_STDARG_H       1
  #define APR_HAVE_STDIO_H        1
  #define APR_HAVE_SYS_TYPES_H    1
  #define APR_HAVE_SYS_UIO_H      0
  #define APR_HAVE_IN_ADDR        1
  
  #define APR_USE_FLOCK_SERIALIZE           0 
  #define APR_USE_SYSVSEM_SERIALIZE         0
  #define APR_USE_FCNTL_SERIALIZE           0
  #define APR_USE_PROC_PTHREAD_SERIALIZE    0 
  #define APR_USE_PTHREAD_SERIALIZE         0 
  
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  
  /*  APR Feature Macros */
  #define APR_HAS_THREADS  1
  #define APR_HAS_SENDFILE 1
  #define APR_HAS_MMAP     0
  
  /* Typedefs that APR needs. */
  
  typedef  short           ap_int16_t;
  typedef  unsigned short  ap_uint16_t;
                                                 
  typedef  int           ap_int32_t;
  typedef  unsigned int  ap_uint32_t;
                                                 
  typedef  __int64           ap_int64_t;
  typedef  unsigned __int64  ap_uint64_t;
  
  typedef  int         ap_size_t;
  typedef  int         ap_ssize_t;
  typedef  _off_t      ap_off_t;
  typedef  int         pid_t;
  typedef  int         uid_t;
  typedef  int         gid_t;
  
  /* Definitions that APR programs need to work properly. */
  #define APR_SSIZE_T_FMT          "d"
  #define API_THREAD_FUNC          __stdcall
  #define API_EXPORT(type)         type
  #define API_EXPORT_NONSTD(type)  type
  #define API_VAR_IMPORT           extern _declspec(dllimport)
  #define API_VAR_EXPORT
  
  /* struct iovec is needed to emulate Unix writev */
  struct iovec {
      char* iov_base;
      int   iov_len;
  };
  #endif /* APR_H */
  #endif /* WIN32 */
  
  
  
  1.1                  apache-2.0/src/lib/apr/include/apr_config.hw
  
  Index: apr_config.hw
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  /*
   * Note: This is the windows specific autoconf like config file (apr_config.h)
   */
  #ifdef WIN32
  
  #ifndef APR_CONFIG_H
  #define APR_CONFIG_H
  
  #ifndef WIN32_LEAN_AND_MEAN
  #define WIN32_LEAN_AND_MEAN
  #endif
  #ifndef _WIN32_WINNT
  /* 
   * Compile the server including all the Windows NT 4.0 header files by 
   * default.
   */
  #define _WIN32_WINNT 0x0400
  #endif
  #include <windows.h>
  #include <winsock2.h>
  #include <mswsock.h>
  #include <sys/types.h>
  #include <stddef.h>
  #include <stdio.h>
  #include <time.h>
  
  #define HAVE_SENDFILE 1
  
  /* Use this section to define all of the HAVE_FOO_H
   * that are required to build properly.
   */
  #define HAVE_CONIO_H 1
  #define HAVE_MALLOC_H 1
  #define HAVE_STDLIB_H 1
  #define HAVE_LIMITS_H 1
  #define HAVE_SIGNAL_H 1
  
  typedef enum {APR_WIN_NT, APR_WIN_95, APR_WIN_98} ap_oslevel_e;
  
  #define SIGHUP     1
  /* 2 is used for SIGINT on windows */
  #define SIGQUIT    3
  /* 4 is used for SIGILL on windows */
  #define SIGTRAP    5
  #define SIGIOT     6
  #define SIGBUS     7
  /* 8 is used for SIGFPE on windows */
  #define SIGKILL    9
  #define SIGUSR1    10
  /* 11 is used for SIGSEGV on windows */
  #define SIGUSR2    12
  #define SIGPIPE    13
  #define SIGALRM    14
  /* 15 is used for SIGTERM on windows */
  #define SIGSTKFLT  16
  #define SIGCHLD    17 
  #define SIGCONT    18
  #define SIGSTOP    19
  #define SIGTSTP    20
  /* 21 is used for SIGBREAK on windows */
  /* 22 is used for SIGABRT on windows */
  #define SIGTTIN    23
  #define SIGTTOU    24
  #define SIGURG     25
  #define SIGXCPU    26
  #define SIGXFSZ    27
  #define SIGVTALRM  28
  #define SIGPROF    29
  #define SIGWINCH   30
  #define SIGIO      31
  
  #define __attribute__(__x) 
  
  /* APR COMPATABILITY FUNCTIONS
   * This section should be used to define functions and
   * macros which are need to make Windows features look
   * like POSIX features.
   */
  typedef void (Sigfunc)(int);
  
  #define strcasecmp(s1, s2)       stricmp(s1, s2)
  #define sleep(t)                 Sleep(t * 1000)
  
  
  /* APR FEATURE MACROS.
   * This section should be used to define feature macros
   * that the windows port needs.
   */
  #define APR_HAS_THREADS        1
  
  #define SIZEOF_SHORT           2
  #define SIZEOF_INT             4
  #define SIZEOF_LONGLONG        8
  #define SIZEOF_CHAR            1
  #define SIZEOF_SSIZE_T         SIZEOF_INT
  
  /* APR WINDOWS-ONLY FUNCTIONS
   * This section should define those functions which are
   * only found in the windows version of APR.
   */
  
  void FileTimeToAprTime(time_t *atime, FILETIME *ft);
  unsigned __stdcall SignalHandling(void *);
  int thread_ready(void);
  
  #endif  /*APR_CONFIG_H*/
  #endif  /*WIN32*/
  
  
  
  1.12      +0 -4      apache-2.0/src/lib/apr/lib/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_cpystrn.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_cpystrn.c	2000/03/31 08:35:59	1.11
  +++ apr_cpystrn.c	2000/04/03 18:40:40	1.12
  @@ -52,11 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#ifndef WIN32
   #include "apr_config.h"
  -#else
  -#include "apr_winconfig.h"
  -#endif
   #include "apr_lib.h"
   
   #if HAVE_SYS_TYPES_H
  
  
  
  1.12      +0 -4      apache-2.0/src/lib/apr/lib/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_getpass.c	2000/03/31 08:35:59	1.11
  +++ apr_getpass.c	2000/04/03 18:40:40	1.12
  @@ -57,11 +57,7 @@
    * wrapper for the system library's getpass() routine; otherwise, we
    * use one we define ourselves.
    */
  -#ifndef WIN32
   #include "apr_config.h"
  -#else
  -#include "apr_winconfig.h"
  -#endif
   #include "apr_lib.h"
   #include "apr_errno.h"
   #include <sys/types.h>
  
  
  
  1.40      +0 -4      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- apr_pools.c	2000/04/03 18:37:12	1.39
  +++ apr_pools.c	2000/04/03 18:40:40	1.40
  @@ -59,11 +59,7 @@
    * rst --- 4/95 --- 6/95
    */
   
  -#ifndef WIN32
   #include "apr_config.h"
  -#else
  -#include "apr_winconfig.h"
  -#endif
   
   #include "apr_general.h"
   #include "apr_pools.h"
  
  
  
  1.7       +0 -4      apache-2.0/src/lib/apr/lib/apr_slack.c
  
  Index: apr_slack.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_slack.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_slack.c	2000/03/31 08:36:00	1.6
  +++ apr_slack.c	2000/04/03 18:40:40	1.7
  @@ -60,11 +60,7 @@
    * 
    */
   
  -#ifndef WIN32
   #include "apr_config.h"
  -#else
  -#include "apr_winconfig.h"
  -#endif
   
   #ifdef APACHE
   #include "http_log.h"
  
  
  
  1.13      +2 -4      apache-2.0/src/lib/apr/lib/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_snprintf.c	2000/03/31 08:36:00	1.12
  +++ apr_snprintf.c	2000/04/03 18:40:40	1.13
  @@ -52,12 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  -#ifndef WIN32
  -#include "apr_config.h"
  -#else
  +#ifdef WIN32
   #include <winsock2.h>
  -#include "apr_winconfig.h"
   #endif
  +#include "apr_config.h"
   
   #include "apr_lib.h"
   #include <math.h>
  
  
  
  1.12      +0 -4      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_tables.c	2000/04/03 18:37:12	1.11
  +++ apr_tables.c	2000/04/03 18:40:40	1.12
  @@ -59,11 +59,7 @@
    * rst --- 4/95 --- 6/95
    */
   
  -#ifndef WIN32
   #include "apr_config.h"
  -#else
  -#include "apr_winconfig.h"
  -#endif
   
   #include "apr_general.h"
   #include "apr_pools.h"
  
  
  
  1.6       +1 -3      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- names.c	2000/04/03 18:37:27	1.5
  +++ names.c	2000/04/03 18:40:41	1.6
  @@ -52,9 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#ifdef WIN32
  -#include "apr_winconfig.h"
  -#endif
  +#include "apr_config.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- start.c	2000/04/03 18:37:27	1.16
  +++ start.c	2000/04/03 18:40:41	1.17
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "misc.h"
   #include "apr_general.h"
   #include "apr_errno.h"
  
  
  
  1.13      +1 -1      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- thread.c	2000/04/03 18:37:53	1.12
  +++ thread.c	2000/04/03 18:40:42	1.13
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- threadproc.h	2000/04/03 18:37:53	1.6
  +++ threadproc.h	2000/04/03 18:40:42	1.7
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_win.h"
  +#include "apr_config.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include <windows.h>
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- atime.h	2000/03/31 08:36:31	1.4
  +++ atime.h	2000/04/03 18:40:42	1.5
  @@ -55,7 +55,7 @@
   #ifndef ATIME_H
   #define ATIME_H
   
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "apr_time.h"
   #include <time.h>
   
  
  
  
  1.6       +22 -4     apache-2.0/src/main/gen_test_char.mak
  
  Index: gen_test_char.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gen_test_char.mak	2000/02/11 18:52:31	1.5
  +++ gen_test_char.mak	2000/04/03 18:40:44	1.6
  @@ -208,6 +208,7 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -215,16 +216,14 @@
   	"..\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"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_GEN_T=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
  @@ -232,8 +231,27 @@
   
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
  +DEP_CPP_GEN_T=\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_iol.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr.h"\
  +	"..\lib\apr\include\apr_errno.h"\
  +	"..\lib\apr\include\apr_file_io.h"\
  +	"..\lib\apr\include\apr_general.h"\
  +	"..\lib\apr\include\apr_lib.h"\
  +	"..\lib\apr\include\apr_network_io.h"\
  +	"..\lib\apr\include\apr_thread_proc.h"\
  +	"..\lib\apr\include\apr_time.h"\
  +	"..\os\win32\os.h"\
  +	
   
  -"$(INTDIR)\gen_test_char.obj" : $(SOURCE) "$(INTDIR)"
  +"$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
   
   
   !ENDIF 
  
  
  
  1.37      +0 -4      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- http_log.c	2000/03/31 08:44:20	1.36
  +++ http_log.c	2000/04/03 18:40:44	1.37
  @@ -65,11 +65,7 @@
   
   
   #define CORE_PRIVATE
  -#ifdef WIN32
  -#include "apr_win.h"
  -#else
   #include "apr.h"  /* for ap_signal */
  -#endif
   #include "ap_config.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
  
  
  
  1.4       +1 -42     apache-2.0/src/os/win32/ApacheModuleAuthAnon.mak
  
  Index: ApacheModuleAuthAnon.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthAnon.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleAuthAnon.mak	2000/03/21 23:26:34	1.3
  +++ ApacheModuleAuthAnon.mak	2000/04/03 18:40:44	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleAuthAnon - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_auth_anon.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
  -
   DEP_CPP_MOD_A=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -195,43 +192,7 @@
   	"..\..\include\http_request.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_lib.h"\
  -	"..\..\lib\apr\include\apr_lock.h"\
  -	"..\..\lib\apr\include\apr_mmap.h"\
  -	"..\..\lib\apr\include\apr_network_io.h"\
  -	"..\..\lib\apr\include\apr_portable.h"\
  -	"..\..\lib\apr\include\apr_thread_proc.h"\
  -	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
  -	".\os.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_A=\
   	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
  -
  -DEP_CPP_MOD_A=\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\http_request.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"\
  @@ -242,15 +203,13 @@
   	"..\..\lib\apr\include\apr_portable.h"\
   	"..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +2 -39     apache-2.0/src/os/win32/ApacheModuleCERNMeta.mak
  
  Index: ApacheModuleCERNMeta.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleCERNMeta.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleCERNMeta.mak	2000/03/21 23:26:35	1.3
  +++ ApacheModuleCERNMeta.mak	2000/04/03 18:40:44	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleCERNMeta - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_cern_meta.c
  -
  -!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
  -
   DEP_CPP_MOD_C=\
   	"..\..\include\ap_ac_config.h"\
   	"..\..\include\ap_config.h"\
  @@ -197,6 +194,7 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\util_script.h"\
   	"..\..\include\util_uri.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -204,54 +202,19 @@
   	"..\..\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.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_C=\
   	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_path.h"\
   	"..\..\include\ap_config_win32.h"\
  -	"..\..\include\apr.h"\
  -	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
  -
  -DEP_CPP_MOD_C=\
  -	"..\..\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_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_script.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_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.h"\
   	
   
   "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +1 -44     apache-2.0/src/os/win32/ApacheModuleDigest.mak
  
  Index: ApacheModuleDigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleDigest.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleDigest.mak	2000/03/21 23:26:35	1.3
  +++ ApacheModuleDigest.mak	2000/04/03 18:40:44	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleDigest - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_digest.c
  -
  -!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
  -
   DEP_CPP_MOD_D=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -197,45 +194,7 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\util_md5.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_lib.h"\
  -	"..\..\lib\apr\include\apr_lock.h"\
  -	"..\..\lib\apr\include\apr_mmap.h"\
  -	"..\..\lib\apr\include\apr_network_io.h"\
  -	"..\..\lib\apr\include\apr_portable.h"\
  -	"..\..\lib\apr\include\apr_thread_proc.h"\
  -	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
  -	".\os.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_D=\
   	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
  -
  -DEP_CPP_MOD_D=\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_md5.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_md5.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -246,15 +205,13 @@
   	"..\..\lib\apr\include\apr_portable.h"\
   	"..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +2 -38     apache-2.0/src/os/win32/ApacheModuleExpires.mak
  
  Index: ApacheModuleExpires.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleExpires.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleExpires.mak	2000/03/21 23:26:35	1.3
  +++ ApacheModuleExpires.mak	2000/04/03 18:40:44	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleExpires - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_expires.c
  -
  -!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
  -
   DEP_CPP_MOD_E=\
   	"..\..\include\ap_ac_config.h"\
   	"..\..\include\ap_config.h"\
  @@ -196,6 +193,7 @@
   	"..\..\include\http_request.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_uri.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -203,53 +201,19 @@
   	"..\..\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.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_E=\
   	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_path.h"\
   	"..\..\include\ap_config_win32.h"\
  -	"..\..\include\apr.h"\
  -	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
  -
  -DEP_CPP_MOD_E=\
  -	"..\..\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_request.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_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.h"\
  -	
  -
  -"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +1 -36     apache-2.0/src/os/win32/ApacheModuleHeaders.mak
  
  Index: ApacheModuleHeaders.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleHeaders.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleHeaders.mak	2000/03/21 23:26:36	1.3
  +++ ApacheModuleHeaders.mak	2000/04/03 18:40:45	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleHeaders - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_headers.c
  -
  -!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
  -
   DEP_CPP_MOD_H=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -192,37 +189,7 @@
   	"..\..\include\http_request.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_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.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_H=\
   	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
  -
  -DEP_CPP_MOD_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_request.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"\
  @@ -230,15 +197,13 @@
   	"..\..\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.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +1 -4      apache-2.0/src/os/win32/ApacheModuleInfo.mak
  
  Index: ApacheModuleInfo.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleInfo.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleInfo.mak	2000/03/21 23:26:36	1.3
  +++ ApacheModuleInfo.mak	2000/04/03 18:40:45	1.4
  @@ -191,6 +191,7 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\util_script.h"\
   	"..\..\include\util_uri.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -201,12 +202,8 @@
   	"..\..\lib\apr\include\apr_portable.h"\
   	"..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
   	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_I=\
  -	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  
  
  
  1.4       +2 -4      apache-2.0/src/os/win32/ApacheModuleRewrite.mak
  
  Index: ApacheModuleRewrite.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleRewrite.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleRewrite.mak	2000/03/21 23:26:37	1.3
  +++ ApacheModuleRewrite.mak	2000/04/03 18:40:45	1.4
  @@ -203,6 +203,7 @@
   	"..\..\include\http_vhost.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_uri.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -213,18 +214,15 @@
   	"..\..\lib\apr\include\apr_portable.h"\
   	"..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
   	"..\..\modules\standard\mod_rewrite.h"\
   	".\os.h"\
  -	{$(INCLUDE)}"sys\locking.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_MOD_R=\
   	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_path.h"\
   	"..\..\include\ap_config_win32.h"\
  -	"..\..\include\apr.h"\
  -	"..\..\lib\apr\include\apr.h"\
   	"..\..\modules\standard\unixd.h"\
   	
   
  
  
  
  1.4       +1 -38     apache-2.0/src/os/win32/ApacheModuleSpeling.mak
  
  Index: ApacheModuleSpeling.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleSpeling.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleSpeling.mak	2000/03/21 23:26:37	1.3
  +++ ApacheModuleSpeling.mak	2000/04/03 18:40:45	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleSpeling - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_speling.c
  -
  -!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
  -
   DEP_CPP_MOD_S=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -194,39 +191,7 @@
   	"..\..\include\http_request.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_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.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_S=\
   	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
  -
  -DEP_CPP_MOD_S=\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_request.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"\
  @@ -234,15 +199,13 @@
   	"..\..\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.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +1 -4      apache-2.0/src/os/win32/ApacheModuleStatus.mak
  
  Index: ApacheModuleStatus.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleStatus.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleStatus.mak	2000/03/21 23:26:38	1.3
  +++ ApacheModuleStatus.mak	2000/04/03 18:40:45	1.4
  @@ -191,6 +191,7 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\mpm_status.h"\
   	"..\..\include\util_uri.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	"..\..\lib\apr\include\apr_errno.h"\
   	"..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\lib\apr\include\apr_general.h"\
  @@ -201,12 +202,8 @@
   	"..\..\lib\apr\include\apr_portable.h"\
   	"..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
   	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_S=\
  -	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  
  
  
  1.4       +1 -37     apache-2.0/src/os/win32/ApacheModuleUserTrack.mak
  
  Index: ApacheModuleUserTrack.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleUserTrack.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleUserTrack.mak	2000/03/21 23:26:38	1.3
  +++ ApacheModuleUserTrack.mak	2000/04/03 18:40:45	1.4
  @@ -179,9 +179,6 @@
   !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleUserTrack - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_usertrack.c
  -
  -!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
  -
   DEP_CPP_MOD_U=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -193,38 +190,7 @@
   	"..\..\include\http_request.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_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.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_U=\
   	"..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
  -
  -DEP_CPP_MOD_U=\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_request.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"\
  @@ -232,15 +198,13 @@
   	"..\..\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.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.6       +1 -1      apache-2.0/src/os/win32/installer/installdll/install.c
  
  Index: install.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- install.c	2000/03/31 09:17:20	1.5
  +++ install.c	2000/04/03 18:40:47	1.6
  @@ -73,7 +73,7 @@
   #include <direct.h>
   #include <time.h>
   
  -#include "apr_winconfig.h"
  +#include "apr_config.h"
   #include "apr_lib.h"
   
   #ifdef strftime
  
  
  
  1.3       +31 -115   apache-2.0/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- install.mak	2000/03/22 15:33:56	1.2
  +++ install.mak	2000/04/03 18:40:47	1.3
  @@ -27,6 +27,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "install - Win32 Release"
   
   OUTDIR=.\Release
  @@ -56,45 +60,11 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D\
    "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
   BSC32_SBRS= \
  @@ -147,11 +117,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D\
    "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
  + /incremental:yes /pdb:"$(OUTDIR)\install.pdb" /debug /machine:I386\
  + /def:".\install.def" /out:"$(OUTDIR)\install.dll"\
  + /implib:"$(OUTDIR)\install.lib" /pdbtype:sept 
  +DEF_FILE= \
  +	".\install.def"
  +LINK32_OBJS= \
  +	"$(INTDIR)\apr_snprintf.obj" \
  +	"$(INTDIR)\install.obj"
  +
  +"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -183,117 +175,41 @@
      $(CPP_PROJ) $< 
   <<
   
  -MTL=midl.exe
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
  - /incremental:yes /pdb:"$(OUTDIR)\install.pdb" /debug /machine:I386\
  - /def:".\install.def" /out:"$(OUTDIR)\install.dll"\
  - /implib:"$(OUTDIR)\install.lib" /pdbtype:sept 
  -DEF_FILE= \
  -	".\install.def"
  -LINK32_OBJS= \
  -	"$(INTDIR)\apr_snprintf.obj" \
  -	"$(INTDIR)\install.obj"
   
  -"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
  -
   !IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\
    "install - Win32 Debug"
   SOURCE=..\..\..\..\lib\apr\lib\apr_snprintf.c
  -
  -!IF  "$(CFG)" == "install - Win32 Release"
  -
   DEP_CPP_APR_S=\
  -	"..\..\..\..\lib\apr\include\apr_errno.h"\
  -	"..\..\..\..\lib\apr\include\apr_file_io.h"\
  -	"..\..\..\..\lib\apr\include\apr_general.h"\
  -	"..\..\..\..\lib\apr\include\apr_lib.h"\
  -	"..\..\..\..\lib\apr\include\apr_thread_proc.h"\
  -	"..\..\..\..\lib\apr\include\apr_time.h"\
  -	"..\..\..\..\lib\apr\include\apr_win.h"\
  -	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_APR_S=\
   	"..\..\..\..\lib\apr\include\apr.h"\
  -	"..\..\..\..\lib\apr\lib\apr_config.h"\
  -	
  -
  -"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "install - Win32 Debug"
  -
  -DEP_CPP_APR_S=\
  +	"..\..\..\..\lib\apr\include\apr_config.h"\
   	"..\..\..\..\lib\apr\include\apr_errno.h"\
   	"..\..\..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\..\..\lib\apr\include\apr_general.h"\
   	"..\..\..\..\lib\apr\include\apr_lib.h"\
   	"..\..\..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\..\..\lib\apr\include\apr_time.h"\
  -	"..\..\..\..\lib\apr\include\apr_win.h"\
  -	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\install.c
  -
  -!IF  "$(CFG)" == "install - Win32 Release"
  -
   DEP_CPP_INSTA=\
  -	"..\..\..\..\lib\apr\include\apr_errno.h"\
  -	"..\..\..\..\lib\apr\include\apr_file_io.h"\
  -	"..\..\..\..\lib\apr\include\apr_general.h"\
  -	"..\..\..\..\lib\apr\include\apr_lib.h"\
  -	"..\..\..\..\lib\apr\include\apr_thread_proc.h"\
  -	"..\..\..\..\lib\apr\include\apr_time.h"\
  -	"..\..\..\..\lib\apr\include\apr_win.h"\
  -	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_INSTA=\
   	"..\..\..\..\lib\apr\include\apr.h"\
  -	
  -
  -"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "install - Win32 Debug"
  -
  -DEP_CPP_INSTA=\
  +	"..\..\..\..\lib\apr\include\apr_config.h"\
   	"..\..\..\..\lib\apr\include\apr_errno.h"\
   	"..\..\..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\..\..\lib\apr\include\apr_general.h"\
   	"..\..\..\..\lib\apr\include\apr_lib.h"\
   	"..\..\..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\..\..\lib\apr\include\apr_time.h"\
  -	"..\..\..\..\lib\apr\include\apr_win.h"\
  -	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.3       +1 -1      apache-2.0/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htdigest.mak	2000/03/21 23:26:49	1.2
  +++ htdigest.mak	2000/04/03 18:40:47	1.3
  @@ -203,9 +203,9 @@
   	
   NODEP_CPP_HTDIG=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
   	"..\include\apr.h"\
  -	"..\include\apr_win.h"\
   	"..\include\os.h"\
   	"..\os\win32\apr_general.h"\
   	".\apr_lib.h"\
  
  
  
  1.4       +3 -4      apache-2.0/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htpasswd.mak	2000/03/22 15:21:56	1.3
  +++ htpasswd.mak	2000/04/03 18:40:47	1.4
  @@ -179,23 +179,22 @@
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
   	"..\lib\apr\include\apr_lib.h"\
   	"..\lib\apr\include\apr_thread_proc.h"\
   	"..\lib\apr\include\apr_time.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTPAS=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
   	"..\include\os.h"\
  -	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  @@ -211,13 +210,13 @@
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
   	"..\lib\apr\include\apr_lib.h"\
   	"..\lib\apr\include\apr_thread_proc.h"\
   	"..\lib\apr\include\apr_time.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	
   
  
  
  
  1.3       +3 -4      apache-2.0/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rotatelogs.mak	2000/03/21 23:26:50	1.2
  +++ rotatelogs.mak	2000/04/03 18:40:47	1.3
  @@ -176,19 +176,18 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_ROTAT=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_path.h"\
   	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
   	"..\include\os.h"\
  -	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  @@ -201,9 +200,9 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
  -	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	
   
  
  
  

Mime
View raw message