nlopess Tue Sep 11 16:17:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32 config0.m4 upgrade-pcre.php
/php-src/ext/pcre/pcrelib dftables.c pcre_chartables.c
pcre_compile.c pcre_config.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c
pcre_info.c pcre_maketables.c
pcre_newline.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c
pcre_ucp_searchfuncs.c pcre_valid_utf8.c
pcre_version.c pcre_xclass.c pcregrep.c
pcreposix.c
Log:
remove the -DHAVE_CONFIG_H switch again to fix things on windows
this means that the upgrade script strips the #ifdef automatically
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.6&r2=1.4.2.5.2.7&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.6
php-src/ext/pcre/config.w32:1.4.2.5.2.7
--- php-src/ext/pcre/config.w32:1.4.2.5.2.6 Sat Sep 1 17:51:35 2007
+++ php-src/ext/pcre/config.w32 Tue Sep 11 16:17:33 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5.2.6 2007/09/01 17:51:35 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.7 2007/09/11 16:17:33 nlopess Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DNO_RECURSE -DHAVE_CONFIG_H -Iext/pcre/pcrelib");
+ "-DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.9&r2=1.38.2.3.2.10&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.9
php-src/ext/pcre/config0.m4:1.38.2.3.2.10
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.9 Sat Sep 1 17:51:35 2007
+++ php-src/ext/pcre/config0.m4 Tue Sep 11 16:17:33 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.9 2007/09/01 17:51:35 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10 2007/09/11 16:17:33 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
- PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/upgrade-pcre.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pcre/upgrade-pcre.php
diff -u php-src/ext/pcre/upgrade-pcre.php:1.1.2.2
php-src/ext/pcre/upgrade-pcre.php:1.1.2.3
--- php-src/ext/pcre/upgrade-pcre.php:1.1.2.2 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/upgrade-pcre.php Tue Sep 11 16:17:33 2007
@@ -33,10 +33,13 @@
{
global $newpcre, $dirlen;
- foreach(scandir($path) as $file) {
+ foreach (scandir($path) as $file) {
- if ($file[0] === '.' || $file === 'CVS') continue;
- if (substr_compare($file, '.lo', -3, 3) == 0 ||
substr_compare($file, '.o', -2, 2) == 0) continue;
+ if ($file[0] === '.' ||
+ $file === 'CVS' ||
+ substr_compare($file, '.lo', -3, 3) == 0 ||
+ substr_compare($file, '.loT', -4, 4) == 0 ||
+ substr_compare($file, '.o', -2, 2) == 0) continue;
$file = "$path/$file";
@@ -58,7 +61,19 @@
die("$newfile is not available any more\n");
}
- copy($newfile, $file);
+ // maintain file mtimes so that cvs doesnt get crazy
+ if (file_get_contents($newfile) !== file_get_contents($file)) {
+ copy($newfile, $file);
+ }
+
+ // always include the config.h file
+ $content = file_get_contents($newfile);
+ $newcontent = preg_replace('/#\s*ifdef
HAVE_CONFIG_H\s*(.+)\s*#\s*endif/', '$1', $content);
+
+ if ($content !== $newcontent) {
+ file_put_contents($file, $newcontent);
+ }
+
echo "OK\n";
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/dftables.c?r1=1.10.2.1.2.4&r2=1.10.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/dftables.c
diff -u php-src/ext/pcre/pcrelib/dftables.c:1.10.2.1.2.4
php-src/ext/pcre/pcrelib/dftables.c:1.10.2.1.2.5
--- php-src/ext/pcre/pcrelib/dftables.c:1.10.2.1.2.4 Sat Sep 1 17:48:41 2007
+++ php-src/ext/pcre/pcrelib/dftables.c Tue Sep 11 16:17:33 2007
@@ -43,9 +43,7 @@
locale. Now that pcre_maketables is a function visible to the outside world, we
make use of its code from here in order to be consistent. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <ctype.h>
#include <stdio.h>
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_chartables.c?r1=1.1.8.2&r2=1.1.8.3&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_chartables.c
diff -u php-src/ext/pcre/pcrelib/pcre_chartables.c:1.1.8.2
php-src/ext/pcre/pcrelib/pcre_chartables.c:1.1.8.3
--- php-src/ext/pcre/pcrelib/pcre_chartables.c:1.1.8.2 Sat Sep 1 17:48:41 2007
+++ php-src/ext/pcre/pcrelib/pcre_chartables.c Tue Sep 11 16:17:33 2007
@@ -20,9 +20,7 @@
header ensures that the array gets flagged as "someone outside this compilation
unit might reference this" and so it will always be supplied to the linker. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_compile.c?r1=1.1.2.1.2.5&r2=1.1.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_compile.c
diff -u php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.5
php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.5 Sat Sep 1 17:48:41 2007
+++ php-src/ext/pcre/pcrelib/pcre_compile.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
supporting internal functions that are not used by other modules. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#define NLBLOCK cd /* Block containing newline information */
#define PSSTART start_pattern /* Field containing processed string start */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_config.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_config.c
diff -u php-src/ext/pcre/pcrelib/pcre_config.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_config.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_config.c:1.1.2.1.2.4 Sat Sep 1 17:48:41 2007
+++ php-src/ext/pcre/pcrelib/pcre_config.c Tue Sep 11 16:17:34 2007
@@ -41,9 +41,7 @@
/* This module contains the external function pcre_config(). */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_exec.c?r1=1.1.2.1.2.6&r2=1.1.2.1.2.7&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_exec.c
diff -u php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.6
php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.7
--- php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.6 Sat Sep 1 17:48:41 2007
+++ php-src/ext/pcre/pcrelib/pcre_exec.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
pattern matching using an NFA algorithm, trying to mimic Perl as closely as
possible. There are also some static supporting functions. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#define NLBLOCK md /* Block containing newline information */
#define PSSTART start_subject /* Field containing processed string start */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_fullinfo.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_fullinfo.c
diff -u php-src/ext/pcre/pcrelib/pcre_fullinfo.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_fullinfo.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_fullinfo.c:1.1.2.1.2.4 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_fullinfo.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
information about a compiled pattern. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_get.c?r1=1.1.2.1.2.5&r2=1.1.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_get.c
diff -u php-src/ext/pcre/pcrelib/pcre_get.c:1.1.2.1.2.5
php-src/ext/pcre/pcrelib/pcre_get.c:1.1.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre_get.c:1.1.2.1.2.5 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_get.c Tue Sep 11 16:17:34 2007
@@ -43,9 +43,7 @@
for these functions came from Scott Wimer. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_globals.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_globals.c
diff -u php-src/ext/pcre/pcrelib/pcre_globals.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_globals.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_globals.c:1.1.2.1.2.4 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_globals.c Tue Sep 11 16:17:34 2007
@@ -46,9 +46,7 @@
all threads. However, when compiling for Virtual Pascal, things are done
differently, and global variables are not used (see pcre.in). */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_info.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_info.c
diff -u php-src/ext/pcre/pcrelib/pcre_info.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_info.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_info.c:1.1.2.1.2.4 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_info.c Tue Sep 11 16:17:34 2007
@@ -43,9 +43,7 @@
deprecated, as it has been superseded by pcre_fullinfo(). */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_maketables.c?r1=1.1.2.1.2.5&r2=1.1.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_maketables.c
diff -u php-src/ext/pcre/pcrelib/pcre_maketables.c:1.1.2.1.2.5
php-src/ext/pcre/pcrelib/pcre_maketables.c:1.1.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre_maketables.c:1.1.2.1.2.5 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_maketables.c Tue Sep 11 16:17:34 2007
@@ -45,9 +45,7 @@
#ifndef DFTABLES
-# ifdef HAVE_CONFIG_H
# include <config.h>
-# endif
# include "pcre_internal.h"
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_newline.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_newline.c
diff -u php-src/ext/pcre/pcrelib/pcre_newline.c:1.1.2.3
php-src/ext/pcre/pcrelib/pcre_newline.c:1.1.2.4
--- php-src/ext/pcre/pcrelib/pcre_newline.c:1.1.2.3 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_newline.c Tue Sep 11 16:17:34 2007
@@ -47,9 +47,7 @@
http://unicode.org/unicode/reports/tr18/. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_ord2utf8.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_ord2utf8.c
diff -u php-src/ext/pcre/pcrelib/pcre_ord2utf8.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_ord2utf8.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_ord2utf8.c:1.1.2.1.2.4 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_ord2utf8.c Tue Sep 11 16:17:34 2007
@@ -41,9 +41,7 @@
/* This file contains a private PCRE function that converts an ordinal
character value into a UTF8 string. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_refcount.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_refcount.c
diff -u php-src/ext/pcre/pcrelib/pcre_refcount.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_refcount.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_refcount.c:1.1.2.1.2.4 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_refcount.c Tue Sep 11 16:17:34 2007
@@ -44,9 +44,7 @@
shared by different users. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_study.c?r1=1.1.2.1.2.5&r2=1.1.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_study.c
diff -u php-src/ext/pcre/pcrelib/pcre_study.c:1.1.2.1.2.5
php-src/ext/pcre/pcrelib/pcre_study.c:1.1.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre_study.c:1.1.2.1.2.5 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_study.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
supporting functions. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_tables.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_tables.c
diff -u php-src/ext/pcre/pcrelib/pcre_tables.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_tables.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_tables.c:1.1.2.1.2.4 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_tables.c Tue Sep 11 16:17:34 2007
@@ -44,9 +44,7 @@
clashes with the library. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_try_flipped.c?r1=1.1.2.1.2.5&r2=1.1.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_try_flipped.c
diff -u php-src/ext/pcre/pcrelib/pcre_try_flipped.c:1.1.2.1.2.5
php-src/ext/pcre/pcrelib/pcre_try_flipped.c:1.1.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre_try_flipped.c:1.1.2.1.2.5 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_try_flipped.c Tue Sep 11 16:17:34 2007
@@ -43,9 +43,7 @@
auxiliary local function to flip the appropriate bytes. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c?r1=1.1.2.2.2.5&r2=1.1.2.2.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c
diff -u php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c:1.1.2.2.2.5
php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c:1.1.2.2.2.6
--- php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c:1.1.2.2.2.5 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_ucp_searchfuncs.c Tue Sep 11 16:17:34 2007
@@ -41,9 +41,7 @@
/* This module contains code for searching the table of Unicode character
properties. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_valid_utf8.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_valid_utf8.c
diff -u php-src/ext/pcre/pcrelib/pcre_valid_utf8.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_valid_utf8.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_valid_utf8.c:1.1.2.1.2.4 Sat Sep 1
17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_valid_utf8.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
strings. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_version.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_version.c
diff -u php-src/ext/pcre/pcrelib/pcre_version.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_version.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_version.c:1.1.2.1.2.4 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_version.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
string that identifies the PCRE version that is in use. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_xclass.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_xclass.c
diff -u php-src/ext/pcre/pcrelib/pcre_xclass.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_xclass.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_xclass.c:1.1.2.1.2.4 Sat Sep 1 17:48:42 2007
+++ php-src/ext/pcre/pcrelib/pcre_xclass.c Tue Sep 11 16:17:34 2007
@@ -43,9 +43,7 @@
pcre_exec() and pcre_def_exec(). */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "pcre_internal.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcregrep.c?r1=1.8.2.1.2.8&r2=1.8.2.1.2.9&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcregrep.c
diff -u php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.8
php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.9
--- php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.8 Sat Sep 1 17:48:43 2007
+++ php-src/ext/pcre/pcrelib/pcregrep.c Tue Sep 11 16:17:34 2007
@@ -37,9 +37,7 @@
-----------------------------------------------------------------------------
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <ctype.h>
#include <locale.h>
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcreposix.c?r1=1.15.2.1.2.6&r2=1.15.2.1.2.7&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcreposix.c
diff -u php-src/ext/pcre/pcrelib/pcreposix.c:1.15.2.1.2.6
php-src/ext/pcre/pcrelib/pcreposix.c:1.15.2.1.2.7
--- php-src/ext/pcre/pcrelib/pcreposix.c:1.15.2.1.2.6 Sat Sep 1 17:48:43 2007
+++ php-src/ext/pcre/pcrelib/pcreposix.c Tue Sep 11 16:17:34 2007
@@ -42,9 +42,7 @@
functions. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
/* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
