Skip to content

Commit a7fc7fe

Browse files
wrowewrowe
committed
 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
1 parent 1c5c6ed commit a7fc7fe

6 files changed

Lines changed: 63 additions & 76 deletions

File tree

‎Apache.dsw‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,10 @@ Package=<4>
546546
Project_Dep_Name libaprutil
547547
End Project Dependency
548548
Begin Project Dependency
549-
Project_Dep_Name pcreposix
549+
Project_Dep_Name gen_test_char
550550
End Project Dependency
551551
Begin Project Dependency
552-
Project_Dep_Name gen_test_char
552+
Project_Dep_Name pcre
553553
End Project Dependency
554554
}}}
555555

@@ -1944,21 +1944,6 @@ Package=<4>
19441944

19451945
###############################################################################
19461946

1947-
Project: "pcreposix"=.\srclib\pcre\pcreposix.dsp - Package Owner=<4>
1948-
1949-
Package=<5>
1950-
{{{
1951-
}}}
1952-
1953-
Package=<4>
1954-
{{{
1955-
Begin Project Dependency
1956-
Project_Dep_Name pcre
1957-
End Project Dependency
1958-
}}}
1959-
1960-
###############################################################################
1961-
19621947
Project: "rotatelogs"=.\support\rotatelogs.dsp - Package Owner=<4>
19631948

19641949
Package=<5>

‎include/ap_regex.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ typedef struct {
8989
int rm_eo;
9090
} ap_regmatch_t;
9191

92-
#ifndef AP_DECLARE
93-
#define AP_DECLARE(x) x
94-
#endif /* AP_DECLARE */
95-
9692
/* The functions */
9793

9894
/**

‎libhttpd.dsp‎

Lines changed: 51 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/util_pcre.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ POSSIBILITY OF SUCH DAMAGE.
4343
-----------------------------------------------------------------------------
4444
*/
4545

46-
#include "apr.h"
46+
#include "httpd.h"
4747
#include "apr_strings.h"
48+
#include "pcre.h"
4849

4950
#define APR_WANT_STRFUNC
5051
#include "apr_want.h"
5152

52-
#include "ap_regex.h"
53-
#include "pcre.h"
54-
5553
#ifndef POSIX_MALLOC_THRESHOLD
5654
#define POSIX_MALLOC_THRESHOLD (10)
5755
#endif

‎srclib/pcre/pcre.dsp‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎srclib/pcre/pcreposix.dsp‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)