And this gets Apache for Windows compiling from the command line and

serving files again. The APR_DECLARE_DATA declaration allows the
ap_*_type structures to be exported which is reqired for the correct
operation of the AP_BUCKET_IS_* macros.

An alternate way to fix this problem is to explicitly break the bucket
type out of the "type" structure in ap_bucketi and represent each bucket
type with an enum.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87228 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bill Stoddard
2000-12-06 04:42:33 +00:00
parent 18990d0a5b
commit 730f195e0a
3 changed files with 60 additions and 62 deletions

View File

@ -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 ".\srclib\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 ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\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 ".\srclib\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 ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\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
@ -206,14 +205,6 @@ SOURCE=.\include\http_connection.h
# End Source File
# Begin Source File
SOURCE=.\server\http_core.c
# End Source File
# Begin Source File
SOURCE=.\include\http_core.h
# End Source File
# Begin Source File
SOURCE=.\include\http_log.h
# End Source File
# Begin Source File
@ -222,22 +213,6 @@ SOURCE=.\include\http_main.h
# End Source File
# Begin Source File
SOURCE=.\server\http_protocol.c
# End Source File
# Begin Source File
SOURCE=.\include\http_protocol.h
# End Source File
# Begin Source File
SOURCE=.\server\http_request.c
# End Source File
# Begin Source File
SOURCE=.\include\http_request.h
# End Source File
# Begin Source File
SOURCE=.\include\http_vhost.h
# End Source File
# Begin Source File
@ -258,6 +233,30 @@ SOURCE=.\server\vhost.c
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\modules\http\http_core.c
# End Source File
# Begin Source File
SOURCE=.\include\http_core.h
# End Source File
# Begin Source File
SOURCE=.\modules\http\http_protocol.c
# End Source File
# Begin Source File
SOURCE=.\include\http_protocol.h
# End Source File
# Begin Source File
SOURCE=.\modules\http\http_request.c
# End Source File
# Begin Source File
SOURCE=.\include\http_request.h
# End Source File
# Begin Source File
SOURCE=.\modules\aaa\mod_access.c
# End Source File
# Begin Source File