From 4fce2ae2c64b61e5ef7cdbdb631b8d5691d1b31f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 17 Oct 2014 15:51:21 +0200 Subject: opcache, intl, gmp, exif, com, bcmath to use static tsrmls --- ext/intl/php_intl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/intl/php_intl.h') diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 3625c4fdcc..265cdb7b9e 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -56,7 +56,10 @@ ZEND_END_MODULE_GLOBALS(intl) /* Macro to access request-wide global variables. */ #ifdef ZTS -#define INTL_G(v) TSRMG(intl_globals_id, zend_intl_globals *, v) +#define INTL_G(v) ZEND_TSRMG(intl_globals_id, zend_intl_globals *, v) +#ifdef COMPILE_DL_INTL +ZEND_TSRMLS_CACHE_EXTERN; +#endif #else #define INTL_G(v) (intl_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/intl/php_intl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/php_intl.h') diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 265cdb7b9e..822ea02183 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -72,7 +72,7 @@ PHP_RINIT_FUNCTION(intl); PHP_RSHUTDOWN_FUNCTION(intl); PHP_MINFO_FUNCTION(intl); -const char *intl_locale_get_default( TSRMLS_D ); +const char *intl_locale_get_default( void ); #define PHP_INTL_VERSION "1.1.0" -- cgit v1.2.1