You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/02/18 00:45:18 UTC
svn commit: r154207 - in httpd/httpd/trunk: Apache.dsw include/ap_regex.h
libhttpd.dsp server/util_pcre.c srclib/pcre/pcre.dsp
srclib/pcre/pcreposix.dsp
Author: wrowe
Date: Thu Feb 17 15:45:16 2005
New Revision: 154207
URL: http://svn.apache.org/viewcvs?view=rev&rev=154207
Log:
Get httpd-2.1 building once again on win32.
NEVER NEVER screw around with redeclaring AP_ macros and constants.
If the compiler won't pick them up, e.g., AP_DECLARE, ya've done
something wrong from the start.
All httpd/ap headers depend on httpd.h - plain and simple, so this
un-convolutes the unusual order here.
STATIC has become PCRE_STATIC, along with some other odd definitions.
The only remaining emit is that _pcre_free export is imported, which
implies something is unusual with the declaration. Still researching.
Modified:
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/include/ap_regex.h
httpd/httpd/trunk/libhttpd.dsp
httpd/httpd/trunk/server/util_pcre.c
httpd/httpd/trunk/srclib/pcre/pcre.dsp
httpd/httpd/trunk/srclib/pcre/pcreposix.dsp
Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Apache.dsw?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Thu Feb 17 15:45:16 2005
@@ -546,10 +546,10 @@
Project_Dep_Name libaprutil
End Project Dependency
Begin Project Dependency
- Project_Dep_Name pcreposix
+ Project_Dep_Name gen_test_char
End Project Dependency
Begin Project Dependency
- Project_Dep_Name gen_test_char
+ Project_Dep_Name pcre
End Project Dependency
}}}
@@ -1939,21 +1939,6 @@
{{{
Begin Project Dependency
Project_Dep_Name dftables
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pcreposix"=.\srclib\pcre\pcreposix.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name pcre
End Project Dependency
}}}
Modified: httpd/httpd/trunk/include/ap_regex.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/ap_regex.h?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/include/ap_regex.h (original)
+++ httpd/httpd/trunk/include/ap_regex.h Thu Feb 17 15:45:16 2005
@@ -89,10 +89,6 @@
int rm_eo;
} ap_regmatch_t;
-#ifndef AP_DECLARE
-#define AP_DECLARE(x) x
-#endif /* AP_DECLARE */
-
/* The functions */
/**
Modified: httpd/httpd/trunk/libhttpd.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/libhttpd.dsp?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/libhttpd.dsp (original)
+++ httpd/httpd/trunk/libhttpd.dsp Thu Feb 17 15:45:16 2005
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,11 +53,11 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
# End Special Build Tool
!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
@@ -74,7 +74,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -88,7 +88,7 @@
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
# End Special Build Tool
!ENDIF
@@ -241,27 +241,27 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\mappers\mod_so.h
+SOURCE=.\modules\filters\mod_include.h
!IF "$(CFG)" == "libhttpd - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_so.h
-InputPath=.\modules\mappers\mod_so.h
+# Begin Custom Build - Creating include/mod_include.h
+InputPath=.\modules\filters\mod_include.h
-".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\mappers\mod_so.h > .\include\mod_so.h
+".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\filters\mod_include.h > .\include\mod_include.h
# End Custom Build
!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_so.h
-InputPath=.\modules\mappers\mod_so.h
+# Begin Custom Build - Creating include/mod_include.h
+InputPath=.\modules\filters\mod_include.h
-".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\mappers\mod_so.h > .\include\mod_so.h
+".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\filters\mod_include.h > .\include\mod_include.h
# End Custom Build
@@ -270,27 +270,27 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\filters\mod_include.h
+SOURCE=.\modules\proxy\mod_proxy.h
!IF "$(CFG)" == "libhttpd - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_include.h
-InputPath=.\modules\filters\mod_include.h
+# Begin Custom Build - Creating include/mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
-".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\filters\mod_include.h > .\include\mod_include.h
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
# End Custom Build
!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_include.h
-InputPath=.\modules\filters\mod_include.h
+# Begin Custom Build - Creating include/mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
-".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\filters\mod_include.h > .\include\mod_include.h
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
# End Custom Build
@@ -299,27 +299,27 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\proxy\mod_proxy.h
+SOURCE=.\modules\mappers\mod_so.h
!IF "$(CFG)" == "libhttpd - Win32 Release"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_proxy.h
-InputPath=.\modules\proxy\mod_proxy.h
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\mappers\mod_so.h
-".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\mappers\mod_so.h > .\include\mod_so.h
# End Custom Build
!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_proxy.h
-InputPath=.\modules\proxy\mod_proxy.h
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\mappers\mod_so.h
-".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\modules\mappers\mod_so.h > .\include\mod_so.h
# End Custom Build
@@ -370,47 +370,47 @@
# End Source File
# Begin Source File
-SOURCE=.\server\config.c
+SOURCE=.\modules\http\byterange_filter.c
# End Source File
# Begin Source File
-SOURCE=.\server\connection.c
+SOURCE=.\modules\http\chunk_filter.c
# End Source File
# Begin Source File
-SOURCE=.\server\core.c
+SOURCE=.\server\config.c
# End Source File
# Begin Source File
-SOURCE=.\server\core_filters.c
+SOURCE=.\server\connection.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\http_core.c
+SOURCE=.\server\core.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\http_protocol.c
+SOURCE=.\server\core_filters.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\http_request.c
+SOURCE=.\modules\http\http_core.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\byterange_filter.c
+SOURCE=.\modules\http\http_etag.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\chunk_filter.c
+SOURCE=.\modules\http\http_filters.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\http_etag.c
+SOURCE=.\modules\http\http_protocol.c
# End Source File
# Begin Source File
-SOURCE=.\modules\http\http_filters.c
+SOURCE=.\modules\http\http_request.c
# End Source File
# Begin Source File
@@ -450,6 +450,10 @@
# PROP Default_Filter ""
# Begin Source File
+SOURCE=.\include\ap_regex.h
+# End Source File
+# Begin Source File
+
SOURCE=.\server\eoc_bucket.c
# End Source File
# Begin Source File
@@ -491,6 +495,10 @@
# Begin Source File
SOURCE=.\include\util_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_pcre.c
# End Source File
# Begin Source File
Modified: httpd/httpd/trunk/server/util_pcre.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/util_pcre.c?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/server/util_pcre.c (original)
+++ httpd/httpd/trunk/server/util_pcre.c Thu Feb 17 15:45:16 2005
@@ -43,14 +43,12 @@
-----------------------------------------------------------------------------
*/
-#include "apr.h"
+#include "httpd.h"
#include "apr_strings.h"
+#include "pcre.h"
#define APR_WANT_STRFUNC
#include "apr_want.h"
-
-#include "ap_regex.h"
-#include "pcre.h"
#ifndef POSIX_MALLOC_THRESHOLD
#define POSIX_MALLOC_THRESHOLD (10)
Modified: httpd/httpd/trunk/srclib/pcre/pcre.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/srclib/pcre/pcre.dsp?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/srclib/pcre/pcre.dsp (original)
+++ httpd/httpd/trunk/srclib/pcre/pcre.dsp Thu Feb 17 15:45:16 2005
@@ -40,8 +40,8 @@
# PROP Output_Dir "LibR"
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcre_src" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibR/pcre_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -63,8 +63,8 @@
# PROP Output_Dir "LibD"
# PROP Intermediate_Dir "LibD"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcre_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibD/pcre_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
Modified: httpd/httpd/trunk/srclib/pcre/pcreposix.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/srclib/pcre/pcreposix.dsp?view=diff&r1=154206&r2=154207
==============================================================================
--- httpd/httpd/trunk/srclib/pcre/pcreposix.dsp (original)
+++ httpd/httpd/trunk/srclib/pcre/pcreposix.dsp Thu Feb 17 15:45:16 2005
@@ -40,8 +40,8 @@
# PROP Output_Dir "LibR"
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\..\include" /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibR/pcreposix_src" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\..\include" /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibR/pcreposix_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -63,8 +63,8 @@
# PROP Output_Dir "LibD"
# PROP Intermediate_Dir "LibD"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /Fd"LibD/pcreposix_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibD/pcreposix_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe