diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2005-02-18 00:45:16 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2005-02-18 00:45:16 +0100 |
| commit | e681eb22c8668fc0f868e6b90c5dcad7e8c47a74 (patch) | |
| tree | 18daedaf4e4a2e1a6161747d939f2ab6871de191 /server | |
| parent | Remove unused variable. (diff) | |
| download | apache2-e681eb22c8668fc0f868e6b90c5dcad7e8c47a74.tar.xz apache2-e681eb22c8668fc0f868e6b90c5dcad7e8c47a74.zip | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154207 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/util_pcre.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/server/util_pcre.c b/server/util_pcre.c index 779eef98f9..97c1b900fc 100644 --- a/server/util_pcre.c +++ b/server/util_pcre.c @@ -43,15 +43,13 @@ POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ -#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) #endif |