summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.h
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2008-07-17 16:08:37 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2008-07-17 16:08:37 +0000
commitf78da21527811c58a5da4150403fc5f94747802c (patch)
tree1ee7222c2a7fdada120342363d5c99c3d98dba99 /ext/mbstring/mbstring.h
parenta00a69b3e53a4057ff953e4fe2eb7022ab4fcd63 (diff)
downloadphp-git-f78da21527811c58a5da4150403fc5f94747802c.tar.gz
- MFH: Removed dependencies from php_mbregex to oniguruma types
Diffstat (limited to 'ext/mbstring/mbstring.h')
-rw-r--r--ext/mbstring/mbstring.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 1393559f8e..7f94db15ad 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -76,10 +76,6 @@
#define PHP_MBSTRING_API 20021024
-#if HAVE_MBREGEX
-#include "php_mbregex.h"
-#endif
-
extern zend_module_entry mbstring_module_entry;
#define mbstring_module_ptr &mbstring_module_entry
@@ -197,8 +193,8 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring)
long strict_detection;
long illegalchars;
mbfl_buffer_converter *outconv;
-#if HAVE_MBREGEX && defined(PHP_MBREGEX_GLOBALS)
- PHP_MBREGEX_GLOBALS
+#if HAVE_MBREGEX
+ struct _zend_mb_regex_globals *mb_regex_globals;
#endif
ZEND_END_MODULE_GLOBALS(mbstring)