diff options
-rw-r--r-- | Apache.dsw | 3 | ||||
-rw-r--r-- | ApacheCore.def | 14 | ||||
-rw-r--r-- | ApacheCore.dsp | 37 | ||||
-rw-r--r-- | httpd.dsp | 37 | ||||
-rw-r--r-- | libhttpd.def | 14 | ||||
-rw-r--r-- | modules/dav/fs/mod_dav_fs.dsp | 6 | ||||
-rw-r--r-- | modules/dav/main/mod_dav.dsp | 10 |
7 files changed, 111 insertions, 10 deletions
diff --git a/Apache.dsw b/Apache.dsw index dbdf12fde1..3a5fef9c27 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -35,6 +35,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name gen_uri_delims End Project Dependency + Begin Project Dependency + Project_Dep_Name sdbmlib + End Project Dependency }}} ############################################################################### diff --git a/ApacheCore.def b/ApacheCore.def index 0d2eb75685..45cf9fba07 100644 --- a/ApacheCore.def +++ b/ApacheCore.def @@ -438,3 +438,17 @@ EXPORTS ap_bucket_create_pool ap_os_create_privileged_process + +; +; apu_dbm symbols +; + apu_dbm_open + apu_dbm_geterror + apu_dbm_close + apu_dbm_fetch + apu_dbm_store + apu_dbm_delete + apu_dbm_exists + apu_dbm_firstkey + apu_dbm_nextkey + apu_dbm_freedatum diff --git a/ApacheCore.dsp b/ApacheCore.dsp index bbf11f72d5..1d3eb52933 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -68,7 +68,7 @@ RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -120,6 +120,35 @@ SOURCE=.\os\win32\os.h # PROP Default_Filter "" # Begin Source File +SOURCE=.\lib\aputil\apu_private.hw + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +# Begin Custom Build +InputPath=.\lib\aputil\apu_private.hw + +".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul + echo Created aputil apu_private.h from apu_private.hw + +# End Custom Build + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +# Begin Custom Build +InputPath=.\lib\aputil\apu_private.hw + +".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul + echo Created aputil apu_private.h from apu_private.hw + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\main\gen_test_char.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" @@ -264,6 +293,10 @@ SOURCE=.\ap\ap_sha1.c SOURCE=.\include\ap_sha1.h # End Source File +# Begin Source File + +SOURCE=.\lib\aputil\apu_dbm.c +# End Source File # End Group # Begin Group "httpd" @@ -43,7 +43,7 @@ RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -68,7 +68,7 @@ RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -120,6 +120,35 @@ SOURCE=.\os\win32\os.h # PROP Default_Filter "" # Begin Source File +SOURCE=.\lib\aputil\apu_private.hw + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +# Begin Custom Build +InputPath=.\lib\aputil\apu_private.hw + +".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul + echo Created aputil apu_private.h from apu_private.hw + +# End Custom Build + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +# Begin Custom Build +InputPath=.\lib\aputil\apu_private.hw + +".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul + echo Created aputil apu_private.h from apu_private.hw + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\main\gen_test_char.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" @@ -264,6 +293,10 @@ SOURCE=.\ap\ap_sha1.c SOURCE=.\include\ap_sha1.h # End Source File +# Begin Source File + +SOURCE=.\lib\aputil\apu_dbm.c +# End Source File # End Group # Begin Group "httpd" diff --git a/libhttpd.def b/libhttpd.def index 0d2eb75685..45cf9fba07 100644 --- a/libhttpd.def +++ b/libhttpd.def @@ -438,3 +438,17 @@ EXPORTS ap_bucket_create_pool ap_os_create_privileged_process + +; +; apu_dbm symbols +; + apu_dbm_open + apu_dbm_geterror + apu_dbm_close + apu_dbm_fetch + apu_dbm_store + apu_dbm_delete + apu_dbm_exists + apu_dbm_firstkey + apu_dbm_nextkey + apu_dbm_freedatum diff --git a/modules/dav/fs/mod_dav_fs.dsp b/modules/dav/fs/mod_dav_fs.dsp index ea24c471c4..181cd9c021 100644 --- a/modules/dav/fs/mod_dav_fs.dsp +++ b/modules/dav/fs/mod_dav_fs.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -68,8 +68,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\mod_dav_fsD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\modules\dav\main" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +# ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /ZI /c +# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/modules/dav/main/mod_dav.dsp b/modules/dav/main/mod_dav.dsp index 9a8e62540f..d479afb154 100644 --- a/modules/dav/main/mod_dav.dsp +++ b/modules/dav/main/mod_dav.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -68,8 +68,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\mod_davD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\modules\dav\main" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c +# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -109,6 +109,10 @@ SOURCE=..\..\modules\dav\main\providers.c # End Source File # Begin Source File +SOURCE=..\..\modules\dav\main\std_liveprop.c +# End Source File +# Begin Source File + SOURCE=..\..\modules\dav\main\util.c # End Source File # Begin Source File |