diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/mbstring/php_mbregex.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/mbstring/php_mbregex.h')
| -rw-r--r-- | ext/mbstring/php_mbregex.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index 0088b0a716..c819f2c17c 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -70,12 +70,12 @@ PHP_MINFO_FUNCTION(mb_regex); typedef struct _zend_mb_regex_globals zend_mb_regex_globals; -zend_mb_regex_globals *php_mb_regex_globals_alloc(TSRMLS_D); -void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals TSRMLS_DC); -int php_mb_regex_set_mbctype(const char *enc TSRMLS_DC); -int php_mb_regex_set_default_mbctype(const char *encname TSRMLS_DC); -const char *php_mb_regex_get_mbctype(TSRMLS_D); -const char *php_mb_regex_get_default_mbctype(TSRMLS_D); +zend_mb_regex_globals *php_mb_regex_globals_alloc(void); +void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals); +int php_mb_regex_set_mbctype(const char *enc); +int php_mb_regex_set_default_mbctype(const char *encname); +const char *php_mb_regex_get_mbctype(void); +const char *php_mb_regex_get_default_mbctype(void); PHP_FUNCTION(mb_regex_encoding); PHP_FUNCTION(mb_ereg); |