diff options
| author | Nuno Lopes <nlopess@php.net> | 2007-09-01 17:51:35 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2007-09-01 17:51:35 +0000 |
| commit | c6f777da1f4723624c4cf168b2d6e54dc26b2b2c (patch) | |
| tree | ff3a2d489516038378842eedd3fbbdc2ac3bf0c8 /ext/pcre | |
| parent | 3edd2a69f27242b50b7afb46dd9220da46820178 (diff) | |
| download | php-git-c6f777da1f4723624c4cf168b2d6e54dc26b2b2c.tar.gz | |
adapt for PCRE 7.3
remove ability to include config.h from php_pcre.c, as it seems pretty useless and produces a few warnings
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/config.w32 | 2 | ||||
| -rw-r--r-- | ext/pcre/config0.m4 | 2 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index b52aa71236..9cd11ce3e1 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -5,7 +5,7 @@ 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 -Iext/pcre/pcrelib"); + "-DNO_RECURSE -DHAVE_CONFIG_H -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"); diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 373af4e9bd..6998153a86 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -11,7 +11,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support, 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,,-I@ext_srcdir@/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,,-DHAVE_CONFIG_H -I@ext_srcdir@/pcrelib) PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/]) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 22e467e155..9a5b7a7bca 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -18,10 +18,6 @@ /* $Id$ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "php.h" #include "php_ini.h" #include "php_globals.h" |