Commit 294fc14f authored by Allan K. Edwards's avatar Allan K. Edwards
Browse files

Get WIN32 building again 


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

ApacheCore.def

+18 −18
Original line number Diff line number Diff line
@@ -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

ApacheCore.dsp

+5 −14
Original line number Diff line number Diff line
@@ -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

httpd.dsp

+5 −14
Original line number Diff line number Diff line
@@ -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

libhttpd.def

+18 −18
Original line number Diff line number Diff line
@@ -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