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/os/win32 os.h
Date Mon, 03 Apr 2000 20:41:16 GMT
stoddard    00/04/03 13:41:15

  Modified:    src      CHANGES
               src/lib/apr aprlib.def aprlib.dsp aprlib.mak
               src/modules/standard mod_so.c
               src/os/win32 os.h
  Added:       src/lib/apr/dso/win32 dso.c dso.h
  Log:
  Get APR DSO code working under Windows
  
  Revision  Changes    Path
  1.53      +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- CHANGES	2000/04/03 18:40:35	1.52
  +++ CHANGES	2000/04/03 20:41:05	1.53
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a3-dev
  +  *) Get APR DSO code working under Windows.
  +     [Bill Stoddard]
  +
     *) 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
  
  
  
  1.15      +4 -1      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- aprlib.def	2000/03/28 22:59:02	1.14
  +++ aprlib.def	2000/04/03 20:41:08	1.15
  @@ -237,4 +237,7 @@
         ap_open_stderr @216
           ap_set_pipe_timeout   @217
           ap_terminate @218
  -
  +        ap_dso_load @219
  +        ap_dso_unload @220
  +        ap_dso_sym @221
  +        ap_dso_init @222
  
  
  
  1.12      +8 -0      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- aprlib.dsp	2000/04/03 19:39:46	1.11
  +++ aprlib.dsp	2000/04/03 20:41:08	1.12
  @@ -142,6 +142,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\dso\win32\dso.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\file_io\win32\fileacc.c
   # End Source File
   # Begin Source File
  @@ -299,6 +303,10 @@
   # Begin Source File
   
   SOURCE=.\time\win32\atime.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dso\win32\dso.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.12      +1022 -83  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- aprlib.mak	2000/04/03 19:39:47	1.11
  +++ aprlib.mak	2000/04/03 20:41:09	1.12
  @@ -55,6 +55,7 @@
   	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\apr_tables.obj"
   	-@erase "$(INTDIR)\dir.obj"
  +	-@erase "$(INTDIR)\dso.obj"
   	-@erase "$(INTDIR)\fileacc.obj"
   	-@erase "$(INTDIR)\filedup.obj"
   	-@erase "$(INTDIR)\filestat.obj"
  @@ -150,6 +151,7 @@
   	"$(INTDIR)\apr_snprintf.obj" \
   	"$(INTDIR)\apr_tables.obj" \
   	"$(INTDIR)\dir.obj" \
  +	"$(INTDIR)\dso.obj" \
   	"$(INTDIR)\fileacc.obj" \
   	"$(INTDIR)\filedup.obj" \
   	"$(INTDIR)\filestat.obj" \
  @@ -189,11 +191,11 @@
   
   !IF "$(RECURSE)" == "0" 
   
  -ALL : ".\include\apr_config.h" ".\include\apr.h" "$(OUTDIR)\aprlib.dll"
  +ALL : "$(OUTDIR)\aprlib.dll"
   
   !ELSE 
   
  -ALL : ".\include\apr_config.h" ".\include\apr.h" "$(OUTDIR)\aprlib.dll"
  +ALL : "$(OUTDIR)\aprlib.dll"
   
   !ENDIF 
   
  @@ -209,6 +211,7 @@
   	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\apr_tables.obj"
   	-@erase "$(INTDIR)\dir.obj"
  +	-@erase "$(INTDIR)\dso.obj"
   	-@erase "$(INTDIR)\fileacc.obj"
   	-@erase "$(INTDIR)\filedup.obj"
   	-@erase "$(INTDIR)\filestat.obj"
  @@ -239,8 +242,6 @@
   	-@erase "$(OUTDIR)\aprlib.ilk"
   	-@erase "$(OUTDIR)\aprlib.lib"
   	-@erase "$(OUTDIR)\aprlib.pdb"
  -	-@erase ".\include\apr.h"
  -	-@erase ".\include\apr_config.h"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  @@ -310,6 +311,7 @@
   	"$(INTDIR)\apr_snprintf.obj" \
   	"$(INTDIR)\apr_tables.obj" \
   	"$(INTDIR)\dir.obj" \
  +	"$(INTDIR)\dso.obj" \
   	"$(INTDIR)\fileacc.obj" \
   	"$(INTDIR)\filedup.obj" \
   	"$(INTDIR)\filestat.obj" \
  @@ -344,7 +346,12 @@
   
   !IF "$(CFG)" == "aprlib - Win32 Release" || "$(CFG)" == "aprlib - Win32 Debug"
   SOURCE=.\time\win32\access.c
  +
  +!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"\
  @@ -359,8 +366,34 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	".\time\win32\atime.h"\
  +	
  +
  +"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_cpystrn.c
  +
  +!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"\
  @@ -374,14 +407,55 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	
  +
  +"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   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"\
  @@ -396,8 +470,33 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"\
  + ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_getpass.c
  +
  +!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"\
  @@ -411,8 +510,33 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	
  +
  +"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_md5.c
  +
  +!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"\
  @@ -427,8 +551,33 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_md5.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"\
  + ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_pools.c
  +
  +!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"\
  @@ -447,8 +596,37 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!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"\
  +	".\include\apr_getopt.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\misc\win32\misc.h"\
  +	
  +
  +"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_slack.c
  +
  +!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"\
  @@ -460,9 +638,6 @@
   NODEP_CPP_APR_S=\
   	".\lib\http_log.h"\
   	
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
   CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
    "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  @@ -475,11 +650,22 @@
   
   !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"\
  +	
   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)
   <<
  @@ -488,7 +674,12 @@
   !ENDIF 
   
   SOURCE=.\lib\apr_snprintf.c
  +
  +!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"\
  @@ -502,158 +693,443 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\lib\apr_tables.c
  -DEP_CPP_APR_T=\
  +!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_getopt.h"\
   	".\include\apr_lib.h"\
  -	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\misc\win32\misc.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
  +"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\dir.c
  -DEP_CPP_DIR_C=\
  -	".\file_io\win32\fileio.h"\
  +!ENDIF 
  +
  +SOURCE=.\lib\apr_tables.c
  +
  +!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"\
  +	".\include\apr_getopt.h"\
   	".\include\apr_lib.h"\
  -	".\include\apr_lock.h"\
  -	".\include\apr_network_io.h"\
   	".\include\apr_pools.h"\
  -	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  +	".\misc\win32\misc.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  +"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\fileacc.c
  -DEP_CPP_FILEA=\
  -	".\file_io\win32\fileio.h"\
  +!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"\
  +	".\include\apr_getopt.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  +	".\misc\win32\misc.h"\
   	
   
  -"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
  +"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\filedup.c
  -DEP_CPP_FILED=\
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\dir.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +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"\
   	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
   	".\include\apr_pools.h"\
  +	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  +"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\filestat.c
  -DEP_CPP_FILES=\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +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"\
   	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
   	".\include\apr_pools.h"\
  +	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  +"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\misc\win32\getopt.c
  -DEP_CPP_GETOP=\
  +!ENDIF 
  +
  +SOURCE=.\dso\win32\dso.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_DSO_C=\
  +	".\dso\win32\dso.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_dso.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  -	".\include\apr_getopt.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\misc\win32\misc.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
  +"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\locks\win32\locks.c
  -DEP_CPP_LOCKS=\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_DSO_C=\
  +	".\dso\win32\dso.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_dso.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
  -	".\include\apr_lock.h"\
  -	".\include\apr_network_io.h"\
  -	".\include\apr_portable.h"\
  +	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\locks\win32\locks.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  +"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\misc\win32\names.c
  -DEP_CPP_NAMES=\
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\fileacc.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +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"\
   	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  +"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\open.c
  -DEP_CPP_OPEN_=\
  -	".\file_io\win32\fileio.h"\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +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"\
   	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\filedup.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +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"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_FILED=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\filestat.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +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"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_FILES=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\misc\win32\getopt.c
  +
  +!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"\
  +	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_GETOP=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_getopt.h"\
  +	".\include\apr_time.h"\
  +	".\misc\win32\misc.h"\
  +	
  +
  +"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  + ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\locks\win32\locks.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_LOCKS=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\locks\win32\locks.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_LOCKS=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
   	".\include\apr_lock.h"\
   	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\locks\win32\locks.h"\
  +	
  +
  +"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  + ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\misc\win32\names.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_NAMES=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\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)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_NAMES=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\open.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_OPEN_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
   	".\include\apr_pools.h"\
   	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
  @@ -665,10 +1141,245 @@
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_OPEN_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\pipe.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_PIPE_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_PIPE_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\network_io\win32\poll.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_POLL_=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_POLL_=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\network_io\win32\networkio.h"\
  +	
  +
  +"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\threadproc\win32\proc.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_PROC_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_PROC_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
  +	
  +
  +"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\readwrite.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_READW=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_READW=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	
  +
  +"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\file_io\win32\seek.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_SEEK_=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
   
  -SOURCE=.\file_io\win32\pipe.c
  -DEP_CPP_PIPE_=\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_SEEK_=\
   	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -676,56 +1387,72 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  +"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\network_io\win32\poll.c
  -DEP_CPP_POLL_=\
  +!ENDIF 
  +
  +SOURCE=.\network_io\win32\sendrecv.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_SENDR=\
  +	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_network_io.h"\
  +	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
  +"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\threadproc\win32\proc.c
  -DEP_CPP_PROC_=\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_SENDR=\
   	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
  -	".\include\apr_lock.h"\
   	".\include\apr_network_io.h"\
   	".\include\apr_pools.h"\
  -	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  +	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  +"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\readwrite.c
  -DEP_CPP_READW=\
  +!ENDIF 
  +
  +SOURCE=.\threadproc\win32\signals.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +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"\
  @@ -733,17 +1460,21 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
  +"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\file_io\win32\seek.c
  -DEP_CPP_SEEK_=\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_SIGNA=\
   	".\file_io\win32\fileio.h"\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -751,72 +1482,85 @@
   	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  +	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  +"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\network_io\win32\sendrecv.c
  -DEP_CPP_SENDR=\
  -	".\file_io\win32\fileio.h"\
  +!ENDIF 
  +
  +SOURCE=.\network_io\win32\sockaddr.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_SOCKA=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_network_io.h"\
  -	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\network_io\win32\networkio.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
  +"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\threadproc\win32\signals.c
  -DEP_CPP_SIGNA=\
  -	".\file_io\win32\fileio.h"\
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_SOCKA=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
  -	".\include\apr_pools.h"\
  +	".\include\apr_network_io.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  +	".\network_io\win32\networkio.h"\
   	
   
  -"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  +"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\network_io\win32\sockaddr.c
  -DEP_CPP_SOCKA=\
  +!ENDIF 
  +
  +SOURCE=.\network_io\win32\sockets.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_SOCKE=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
   	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\network_io\win32\networkio.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
  +"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\network_io\win32\sockets.c
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
   DEP_CPP_SOCKE=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -827,15 +1571,21 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\network_io\win32\networkio.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
  +"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
  + ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ENDIF 
  +
   SOURCE=.\network_io\win32\sockopt.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_SOCKO=\
  +	".\include\apr.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -851,8 +1601,34 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_SOCKO=\
  +	".\include\apr.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\network_io\win32\networkio.h"\
  +	
  +
  +"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
  + ".\include\apr.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\misc\win32\start.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_START=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -869,8 +1645,36 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_START=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_getopt.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_pools.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\misc\win32\misc.h"\
  +	
  +
  +"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\threadproc\win32\thread.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_THREA=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -888,8 +1692,37 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_THREA=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
  +	
  +
  +"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\threadproc\win32\threadcancel.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_THREAD=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -903,8 +1736,33 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_THREAD=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
  +	
  +
  +"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\threadproc\win32\threadpriv.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_THREADP=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -922,8 +1780,37 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_THREADP=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\threadproc\win32\threadproc.h"\
  +	
  +
  +"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\time\win32\time.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_TIME_=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -941,8 +1828,37 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_TIME_=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\time\win32\atime.h"\
  +	
  +
  +"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\time\win32\timestr.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
   DEP_CPP_TIMES=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
  @@ -958,6 +1874,29 @@
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +DEP_CPP_TIMES=\
  +	".\include\apr.h"\
  +	".\include\apr_config.h"\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lock.h"\
  +	".\include\apr_network_io.h"\
  +	".\include\apr_portable.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\time\win32\atime.h"\
  +	
  +
  +"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   SOURCE=.\include\apr_config.hw
   
  
  
  
  1.1                  apache-2.0/src/lib/apr/dso/win32/dso.c
  
  Index: dso.c
  ===================================================================
  /* ====================================================================
   * 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/>.
   */
  
  #include "dso.h"
  
  ap_status_t ap_dso_init(void){
      return APR_SUCCESS;
  }
  
  ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, 
                          ap_context_t *ctx)
  {
      HINSTANCE os_handle = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
      if(os_handle == NULL) {
          return GetLastError();
      }
  
      *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
      (*res_handle)->handle = (void*)os_handle;
      (*res_handle)->cont = ctx;
      return APR_SUCCESS;
  }
      
  ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
  {
      if (!FreeLibrary(handle)) {
          return GetLastError();
      }
      return APR_SUCCESS;
  }
  
  ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
                         struct ap_dso_handle_t *handle, 
                         const char *symname)
  {
      HINSTANCE retval = GetProcAddress(handle->handle, symname);
      if (!retval) {
          return GetLastError();
      }
      
      ressym = retval;
      
      return APR_SUCCESS;
  }
  
  
  
  1.1                  apache-2.0/src/lib/apr/dso/win32/dso.h
  
  Index: dso.h
  ===================================================================
  /* ====================================================================
   * 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_config.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  
  struct ap_dso_handle_t {
      ap_context_t  *cont;
      void          *handle;
  };
  
  #endif
  
  
  
  1.11      +1 -1      apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_so.c	2000/04/02 18:15:00	1.10
  +++ mod_so.c	2000/04/03 20:41:12	1.11
  @@ -158,7 +158,7 @@
       soc->loaded_modules = ap_make_array(p, DYNAMIC_MODULE_LIMIT, 
                                        sizeof(moduleinfo));
   #ifndef NO_DLOPEN
  -    ap_os_dso_init();
  +    ap_dso_init();
   #endif
   
       return (void *)soc;
  
  
  
  1.20      +0 -11     apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- os.h	2000/03/31 09:17:18	1.19
  +++ os.h	2000/04/03 20:41:14	1.20
  @@ -166,18 +166,7 @@
   int ap_os_is_filename_valid(const char *file);
   int os_strftime(char *, size_t , const char *, const struct tm *);
   
  -/* Abstractions for dealing with shared object files (DLLs on Win32).
  - * These are used by mod_so.c
  - * ToDo: This need to be migrated to APR
  - */
  -
  -#define ap_os_dso_handle_t  HINSTANCE
  -#define ap_os_dso_init()
  -#define ap_os_dso_load(l)   LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)
  -#define ap_os_dso_unload(l) FreeLibrary(l)
  -#define ap_os_dso_sym(h,s)  GetProcAddress(h,s)
   #define ap_os_dso_error()   ""	/* for now */
  -
   /* Other ap_os_ routines not used by this platform */
   #define ap_os_kill(pid, sig)                kill(pid, sig)
   
  
  
  

Mime
View raw message