diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2003-08-23 06:18:44 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2003-08-23 06:18:44 +0000 |
| commit | 5a80df26f3a66f08c376bf959e608ea80071204a (patch) | |
| tree | bad99c2afb794cc1795c4be0701d1883b19ff85e /ext/mbstring/php_mbregex.h | |
| parent | d696f1267af69779aa361159de563d1886989a1a (diff) | |
| download | php-git-5a80df26f3a66f08c376bf959e608ea80071204a.tar.gz | |
@mbfilter is changed to bundled version of libmbfl to prevent LGPL licence problem. mbregex is changed to oniguruma.
Diffstat (limited to 'ext/mbstring/php_mbregex.h')
| -rw-r--r-- | ext/mbstring/php_mbregex.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index 3726ee03c1..f51a431b4d 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -25,19 +25,20 @@ #include "php.h" #include "zend.h" -#include "mbregex.h" +#include "oniguruma/oniguruma.h" /* {{{ PHP_MBREGEX_GLOBALS */ #define PHP_MBREGEX_GLOBALS \ - int default_mbctype; \ - int current_mbctype; \ + php_mb_reg_char_encoding default_mbctype; \ + php_mb_reg_char_encoding current_mbctype; \ HashTable ht_rc; \ - zval **search_str; \ + zval *search_str; \ zval *search_str_val; \ unsigned int search_pos; \ - mb_regex_t *search_re; \ - struct mbre_registers *search_regs; \ - int regex_default_options; + php_mb_regex_t *search_re; \ + struct php_mb_re_registers *search_regs; \ + int regex_default_options; \ + php_mb_reg_syntax_type *regex_default_syntax; /* }}} */ /* {{{ PHP_MBREGEX_FUNCTION_ENTRIES */ @@ -77,16 +78,15 @@ typedef struct _zend_mbstring_globals * zend_mbstring_globals_ptr; #define PHP_MBREGEX_MAXCACHE 50 -int php_mb_regex_name2mbctype(const char *pname); -int php_mb_regex_set_options(int options TSRMLS_DC); -int php_mb_regex_set_options_by_string(const char *optstr, int len TSRMLS_DC); - PHP_MINIT_FUNCTION(mb_regex); PHP_MSHUTDOWN_FUNCTION(mb_regex); PHP_RINIT_FUNCTION(mb_regex); PHP_RSHUTDOWN_FUNCTION(mb_regex); void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); +void php_mb_regex_set_options(php_mb_reg_option_type options, php_mb_reg_syntax_type *syntax, php_mb_reg_option_type *prev_options, php_mb_reg_syntax_type **prev_syntax TSRMLS_DC); void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); +php_mb_reg_char_encoding php_mb_regex_name2mbctype(const char *pname); +const char *php_mb_regex_mbctype2name(php_mb_reg_char_encoding mbctype); PHP_FUNCTION(mb_regex_encoding); PHP_FUNCTION(mb_ereg); |