diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-07-16 02:30:49 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-07-16 02:30:49 +0000 |
| commit | 88318e0294f0b0b95eacbd4e24fe6c718a72390f (patch) | |
| tree | e18e3824e6cb5cdcc8a0a9968c9d33b99f84ccab /ext/mbstring/php_mbregex.h | |
| parent | 817f393a2d5238b780803fa27518bdc27f4a22f8 (diff) | |
| download | php-git-88318e0294f0b0b95eacbd4e24fe6c718a72390f.tar.gz | |
- MFH: Added a new configure option --with-onig=[DIR] that allows the extension
to link to the external oniguruma library.
- MFH: Prevent libmbfl files from being installed when --with-libmbfl is
specified.
Diffstat (limited to 'ext/mbstring/php_mbregex.h')
| -rw-r--r-- | ext/mbstring/php_mbregex.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index 807a1c64df..8326fed316 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -25,7 +25,9 @@ #include "php.h" #include "zend.h" -#include "oniguruma/oniguruma.h" +#include "php_onig_compat.h" /* must come prior to the oniguruma header */ +#include "oniguruma.h" +#undef UChar /* {{{ PHP_MBREGEX_GLOBALS */ #define PHP_MBREGEX_GLOBALS \ @@ -82,6 +84,7 @@ PHP_MINIT_FUNCTION(mb_regex); PHP_MSHUTDOWN_FUNCTION(mb_regex); PHP_RINIT_FUNCTION(mb_regex); PHP_RSHUTDOWN_FUNCTION(mb_regex); +PHP_MINFO_FUNCTION(mb_regex); void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); void php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *syntax, OnigOptionType *prev_options, OnigSyntaxType **prev_syntax TSRMLS_DC); void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); |