diff options
| author | Andrey Hristov <andrey@php.net> | 1999-05-27 13:59:39 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 1999-05-27 13:59:39 +0000 |
| commit | e10e4dbe103cf9b1dfdbc338e338e33cd46a17d7 (patch) | |
| tree | f183745017dd1295eed81abbbbf3f9912cc62c30 /ext/pcre/php_pcre.h | |
| parent | 96434e48996edd62398643505a7d8e483d1d930e (diff) | |
| download | php-git-e10e4dbe103cf9b1dfdbc338e338e33cd46a17d7.tar.gz | |
Really fix the configuration now so that it's possible to compile both
against the bundled PCRE library and the one external to the source tree.
Crossing my fingers while Zeev compiles this. :)
Diffstat (limited to 'ext/pcre/php_pcre.h')
| -rw-r--r-- | ext/pcre/php_pcre.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index a717cdbf8e..d4a8e12b30 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/php_pcre.h @@ -32,9 +32,13 @@ #ifndef _PHP_PCRE_H #define _PHP_PCRE_H -#if HAVE_LIBPCRE +#if HAVE_PCRE +#if HAVE_BUNDLED_PCRE #include "pcrelib/pcre.h" +#else +#include "pcre.h" +#endif extern void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS); extern int php_minit_pcre(INIT_FUNC_ARGS); @@ -50,8 +54,8 @@ extern zend_module_entry pcre_module_entry; #define pcre_module_ptr &pcre_module_entry typedef struct { - pcre *re; - pcre_extra *extra; + pcre *re; + pcre_extra *extra; } pcre_cache_entry; typedef struct { @@ -79,7 +83,7 @@ extern ZEND_API php_pcre_globals pcre_globals; #define pcre_module_ptr NULL -#endif /* HAVE_LIBPCRE */ +#endif /* HAVE_PCRE */ #define phpext_pcre_ptr pcre_module_ptr |