From 7f1107de9167ab1443a13491f5b70aa3f10fd323 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 16 Oct 2014 13:47:43 +0200 Subject: converted ext/ereg, ext/phar and ext/pgsql for static tsrmls usage --- ext/ereg/php_ereg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/ereg/php_ereg.h') diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h index f1c2676772..a1081e2669 100644 --- a/ext/ereg/php_ereg.h +++ b/ext/ereg/php_ereg.h @@ -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 -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/ereg/php_ereg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/ereg/php_ereg.h') diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h index a1081e2669..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); -- cgit v1.2.1