Mercurial > hg > nginx

changeset 5343:bd828a14e017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 23 Aug 2013 22:54:08 +0400
parents b3f6290a9401
children 376a5e769400
files auto/lib/pcre/makefile.bcc auto/lib/pcre/makefile.msvc auto/lib/pcre/makefile.owc misc/GNUmakefile
diffstat 4 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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:
--- 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:
--- 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