Get WIN32 building again

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

diff --git a/ApacheCore.def b/ApacheCore.def
index 45cf9fba074fce670b936bfd30946ca7416cc699..e4c8f1c9b3d8425e2df2d45c3a4c553d10de8e73 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -24,25 +24,25 @@ EXPORTS
        ap_auth_name
        ap_auth_type
        ap_basic_http_header
-       ap_bclose
-       ap_bcreate
-       ap_bfilbuf
 
-       ap_bflsbuf
-       ap_bflush
-       ap_bgetopt
-       ap_bgets
 
 
-       ap_blookc
 
-       ap_bonerror
 
 
-       ap_bputs
 
-       ap_bsetflag
-       ap_bsetopt
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -258,7 +258,7 @@ EXPORTS
        ap_update_mtime
 
 
-       ap_vbprintf
+
 
 
 
@@ -272,8 +272,8 @@ EXPORTS
        regfree
        access_module
        alias_module
-       ap_bprintf
-       ap_bputstrs
+
+
 
 
        ap_limit_section
@@ -396,9 +396,9 @@ EXPORTS
         ap_get_status_table
         ap_run_default_port
         ap_run_http_method
-        ap_bread_core
-        ap_bwrite_core
-        ap_vbputstrs
+
+
+
 
 ;       Exclusively provided for http_main.c
         ap_register_hooks

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index 1d3eb529339c48228bd1741780921f7e5a44952b..690203844e01e9df9d4351cf0b35cb1f85775f55 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -26,6 +26,7 @@ CFG=ApacheCore - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
 
@@ -39,11 +40,10 @@ CPP=cl.exe
 # PROP Output_Dir "LibR"
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
-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 ".\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
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -64,11 +64,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-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 ".\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
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -447,14 +446,6 @@ SOURCE=.\modules\standard\mod_userdir.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\main\buff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\buff.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\rfc1413.c
 # End Source File
 # Begin Source File

diff --git a/httpd.dsp b/httpd.dsp
index 1d3eb529339c48228bd1741780921f7e5a44952b..690203844e01e9df9d4351cf0b35cb1f85775f55 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -26,6 +26,7 @@ CFG=ApacheCore - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
 
@@ -39,11 +40,10 @@ CPP=cl.exe
 # PROP Output_Dir "LibR"
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
-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 ".\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
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -64,11 +64,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-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 ".\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
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -447,14 +446,6 @@ SOURCE=.\modules\standard\mod_userdir.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\main\buff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\buff.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\rfc1413.c
 # End Source File
 # Begin Source File

diff --git a/libhttpd.def b/libhttpd.def
index 45cf9fba074fce670b936bfd30946ca7416cc699..e4c8f1c9b3d8425e2df2d45c3a4c553d10de8e73 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -24,25 +24,25 @@ EXPORTS
        ap_auth_name
        ap_auth_type
        ap_basic_http_header
-       ap_bclose
-       ap_bcreate
-       ap_bfilbuf
 
-       ap_bflsbuf
-       ap_bflush
-       ap_bgetopt
-       ap_bgets
 
 
-       ap_blookc
 
-       ap_bonerror
 
 
-       ap_bputs
 
-       ap_bsetflag
-       ap_bsetopt
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -258,7 +258,7 @@ EXPORTS
        ap_update_mtime
 
 
-       ap_vbprintf
+
 
 
 
@@ -272,8 +272,8 @@ EXPORTS
        regfree
        access_module
        alias_module
-       ap_bprintf
-       ap_bputstrs
+
+
 
 
        ap_limit_section
@@ -396,9 +396,9 @@ EXPORTS
         ap_get_status_table
         ap_run_default_port
         ap_run_http_method
-        ap_bread_core
-        ap_bwrite_core
-        ap_vbputstrs
+
+
+
 
 ;       Exclusively provided for http_main.c
         ap_register_hooks