Make Win32 build again

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87129 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index dbdf12fde1a9456f5f644917e42b6fc03cf87d9e..3a5fef9c274d299a0ed7add991355018186cde97 100644 (file)
--- 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 0d2eb756859c1a71a0f58711865b9866df56cfd0..45cf9fba074fce670b936bfd30946ca7416cc699 100644 (file)
--- 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 bbf11f72d5eb40ff5e42333f6a7741d4730c267e..1d3eb529339c48228bd1741780921f7e5a44952b 100644 (file)
--- 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"
 

diff --git a/httpd.dsp b/httpd.dsp
index bbf11f72d5eb40ff5e42333f6a7741d4730c267e..1d3eb529339c48228bd1741780921f7e5a44952b 100644 (file)
--- a/httpd.dsp
+++ b/httpd.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"
 

diff --git a/libhttpd.def b/libhttpd.def
index 0d2eb756859c1a71a0f58711865b9866df56cfd0..45cf9fba074fce670b936bfd30946ca7416cc699 100644 (file)
--- 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 ea24c471c467ee6cad2e3bb6f6784e016979513a..181cd9c021efa96f3e60cf9b3ee1cb8f10a557d0 100644 (file)
--- 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 9a8e62540f6b58ca418880db56393254e069e469..d479afb15439d4c4d3b4fade3cd0946a8aa04853 100644 (file)
--- 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