From: Edin Kadribasic <edink@php.net>
Date: Tue, 7 Mar 2006 09:33:00 +0000 (+0000)
Subject: Sync pcre update changes
X-Git-Tag: php-4.4.3RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75d2330427e4ec46770f3f3a14dd6b3563a8418c;p=php

Sync pcre update changes
---

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 490fc30413..6274451772 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -409,13 +409,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_chartables.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -428,13 +430,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_compile.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -447,13 +451,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_config.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -466,13 +472,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_dfa_exec.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -485,13 +493,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_exec.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -504,13 +514,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_fullinfo.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -523,13 +535,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_get.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -542,13 +556,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_globals.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -561,13 +577,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_info.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -580,13 +598,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_maketables.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -599,32 +619,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_ord2utf8.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
-
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
-
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
-
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
-
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\pcre\pcrelib\pcre_printint.c
-
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -637,13 +640,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_refcount.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -656,13 +661,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_study.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -675,13 +682,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_tables.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -694,13 +703,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_try_flipped.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -709,17 +720,19 @@ SOURCE=..\ext\pcre\pcrelib\pcre_try_flipped.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\ext\pcre\pcrelib\pcre_ucp_findchar.c
+SOURCE=..\ext\pcre\pcrelib\pcre_ucp_searchfuncs.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -732,13 +745,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_valid_utf8.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -751,13 +766,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_version.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -770,13 +787,15 @@ SOURCE=..\ext\pcre\pcrelib\pcre_xclass.c
 
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
+
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
-# ADD CPP /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D "SUPPORT_UTF8" /D "SUPPORT_UCP" /D LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"