[nginx] Updated PCRE used for win32 builds.

Maxim Dounin mdounin at mdounin.ru
Fri Aug 23 23:16:40 UTC 2013


details:   http://hg.nginx.org/nginx/rev/bd828a14e017
branches:  
changeset: 5343:bd828a14e017
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Aug 23 22:54:08 2013 +0400
description:
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:

 auto/lib/pcre/makefile.bcc  |  3 ++-
 auto/lib/pcre/makefile.msvc |  3 ++-
 auto/lib/pcre/makefile.owc  |  3 ++-
 misc/GNUmakefile            |  2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diffs (51 lines):

diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc
--- 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
--- 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
--- 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
--- 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



More information about the nginx-devel mailing list