Nice to see we build again on Win32

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

diff --git a/ApacheCore.def b/ApacheCore.def
index 2200a7420480d20a910a9a2e9a25ca73669c1c50..270fa889c0ebf9b536d7ac69b2044041615140bf 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -214,7 +214,7 @@ EXPORTS
        ap_rwrite   @207
        ap_satisfies   @208
        ap_scan_script_header_err   @209
-       ap_scan_script_header_err_buff   @210
+
        ap_scan_script_header_err_core   @211
        ap_scan_script_header_err_strs   @212
 

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index 76c6f92ab3833d2eebacc62d77bad9841f4fab59..7777622b1cab1af428bdaca9b14219d0b708cf33 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,7 +22,6 @@ CFG=ApacheCore - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -67,8 +66,8 @@ LIB32=link.exe -lib
 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 BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
+# ADD CPP /nologo /MDd /W3 /GX /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 /ZI /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -123,6 +122,10 @@ SOURCE=.\ap\ap_buckets_simple.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ap\ap_buckets_socket.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ap\ap_hooks.c
 # End Source File
 # Begin Source File

diff --git a/httpd.dsp b/httpd.dsp
index 76c6f92ab3833d2eebacc62d77bad9841f4fab59..7777622b1cab1af428bdaca9b14219d0b708cf33 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,7 +22,6 @@ CFG=ApacheCore - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -67,8 +66,8 @@ LIB32=link.exe -lib
 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 BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
+# ADD CPP /nologo /MDd /W3 /GX /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 /ZI /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -123,6 +122,10 @@ SOURCE=.\ap\ap_buckets_simple.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ap\ap_buckets_socket.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ap\ap_hooks.c
 # End Source File
 # Begin Source File

diff --git a/libhttpd.def b/libhttpd.def
index 2200a7420480d20a910a9a2e9a25ca73669c1c50..270fa889c0ebf9b536d7ac69b2044041615140bf 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -214,7 +214,7 @@ EXPORTS
        ap_rwrite   @207
        ap_satisfies   @208
        ap_scan_script_header_err   @209
-       ap_scan_script_header_err_buff   @210
+
        ap_scan_script_header_err_core   @211
        ap_scan_script_header_err_strs   @212