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/ereg/php_ereg.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/ereg/php_ereg.h')
| -rw-r--r-- | ext/ereg/php_ereg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h index f1c2676772..4396fb9304 100644 --- a/ext/ereg/php_ereg.h +++ b/ext/ereg/php_ereg.h @@ -35,7 +35,7 @@ extern zend_module_entry ereg_module_entry; # define PHP_EREG_API #endif -PHP_EREG_API char *php_ereg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended TSRMLS_DC); +PHP_EREG_API char *php_ereg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended); PHP_FUNCTION(ereg); PHP_FUNCTION(eregi); @@ -54,7 +54,7 @@ ZEND_END_MODULE_GLOBALS(ereg) PHP_MINFO_FUNCTION(ereg); #ifdef ZTS -#define EREG(v) TSRMG(ereg_globals_id, zend_ereg_globals *, v) +#define EREG(v) ZEND_TSRMG(ereg_globals_id, zend_ereg_globals *, v) #else #define EREG(v) (ereg_globals.v) #endif |