summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.h
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>1999-09-14 19:24:37 +0000
committerAndrey Hristov <andrey@php.net>1999-09-14 19:24:37 +0000
commit870a6679ff21e52753e47614b85d300c2f55b211 (patch)
treebd21962430d1328d82a586fc3bc3cd97a9944733 /ext/pcre/php_pcre.h
parent61a3c147c3e8a8db79219a5c225db6bca30220a5 (diff)
downloadphp-git-870a6679ff21e52753e47614b85d300c2f55b211.tar.gz
- Updated bundled PCRE library to version 2.08
- Made it possible to specify external location of the PCRE library - Reworked PCRE extension to use updated PCRE library API Hopefully now everything behaves just like Perl..
Diffstat (limited to 'ext/pcre/php_pcre.h')
-rw-r--r--ext/pcre/php_pcre.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index 9ddd1f1755..4809b32a2c 100644
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -32,9 +32,14 @@
#ifndef _PHP_PCRE_H
#define _PHP_PCRE_H
-#if HAVE_PCRE
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if HAVE_BUNDLED_PCRE
#include "pcrelib/pcre.h"
+#else
+#include "pcre.h"
+#endif
+
#if HAVE_LOCALE_H
#include <locale.h>
#endif
@@ -84,7 +89,7 @@ extern ZEND_API php_pcre_globals pcre_globals;
#define pcre_module_ptr NULL
-#endif /* HAVE_PCRE */
+#endif /* HAVE_PCRE || HAVE_BUNDLED_PCRE */
#define phpext_pcre_ptr pcre_module_ptr