diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-23 22:54:08 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-23 22:54:08 +0400 |
| commit | d5591e914e69322ac5468cf8088945562d6f2d15 (patch) | |
| tree | 0cdc6d5baa793f8d0c27668d82633976c1d22bd5 | |
| parent | 4ef185789ed3a8850ba79f06aeb95405ea15e64d (diff) | |
| download | nginx-d5591e914e69322ac5468cf8088945562d6f2d15.tar.gz nginx-d5591e914e69322ac5468cf8088945562d6f2d15.tar.bz2 | |
Updated PCRE used for win32 builds.
As of PCRE 8.33, config.h.generic no longer contains boolean macros. Two
of them (SUPPORT_PCRE8 and HAVE_MEMMOVE) were added to appropriate makefiles.
This allows PCRE 8.33 to compile and don't change anything for previous
versions.
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/pcre/makefile.bcc | 3 | ||||
| -rw-r--r-- | auto/lib/pcre/makefile.msvc | 3 | ||||
| -rw-r--r-- | auto/lib/pcre/makefile.owc | 3 | ||||
| -rw-r--r-- | misc/GNUmakefile | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc index 1c140d668..7230f3205 100644 --- a/auto/lib/pcre/makefile.bcc +++ b/auto/lib/pcre/makefile.bcc @@ -4,7 +4,8 @@ CFLAGS = -q -O2 -tWM -w-8004 $(CPU_OPT) -PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 +PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \ + -DSUPPORT_PCRE8 -DHAVE_MEMMOVE pcre.lib: diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc index 7a8da7158..07fd9a285 100644 --- a/auto/lib/pcre/makefile.msvc +++ b/auto/lib/pcre/makefile.msvc @@ -4,7 +4,8 @@ CFLAGS = -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 +PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \ + -DSUPPORT_PCRE8 -DHAVE_MEMMOVE pcre.lib: diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc index bfb692068..78f5257b3 100644 --- a/auto/lib/pcre/makefile.owc +++ b/auto/lib/pcre/makefile.owc @@ -4,7 +4,8 @@ CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) -PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 +PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \ + -DSUPPORT_PCRE8 -DHAVE_MEMMOVE pcre.lib: diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 0887398eb..a190b453c 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -7,7 +7,7 @@ TEMP = tmp OBJS = objs.msvc8 OPENSSL = openssl-1.0.1e ZLIB = zlib-1.2.8 -PCRE = pcre-8.32 +PCRE = pcre-8.33 release: export |