fix some extension builds

4 files changed, 6 insertions, 11 deletions

diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index b27652aa9a..4e544668c5 100644
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -230,7 +230,7 @@ static void php_converter_to_u_callback(const void *context,
 	zval retval;
 	zval zargs[4];
 #ifdef ZTS
-	TSRMLS_D = objval->tsrm_ls;
+	void ***tsrm_ls = objval->tsrm_ls;
 #endif
 
 	ZVAL_LONG(&zargs[0], reason);
@@ -309,7 +309,7 @@ static void php_converter_from_u_callback(const void *context,
 	zval zargs[4];
 	int i;
 #ifdef ZTS
-	TSRMLS_D = objval->tsrm_ls;
+	void ***tsrm_ls = objval->tsrm_ls;
 #endif
 
 	ZVAL_LONG(&zargs[0], reason);
@@ -1046,7 +1046,7 @@ static zend_object *php_converter_object_ctor(zend_class_entry *ce, php_converte
 
 	zend_object_std_init(&objval->obj, ce TSRMLS_CC );
 #ifdef ZTS
-	objval->tsrm_ls = TSRMLS_C;
+	objval->tsrm_ls = tsrm_get_ls_cache();
 #endif
 	intl_error_init(&(objval->error) TSRMLS_CC);
 
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index f1fde4efbb..0bbfe0133c 100644
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -39,8 +39,6 @@ static const char * const mysqlnd_debug_empty_string = "";
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_debug, open)(MYSQLND_DEBUG * self, zend_bool reopen)
 {
-	MYSQLND_ZTS(self);
-
 	if (!self->file_name) {
 		return FAIL;
 	}
@@ -67,7 +65,6 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
 	unsigned int flags = self->flags;
 	char pid_buffer[10], time_buffer[30], file_buffer[200],
 		 line_buffer[6], level_buffer[7];
-	MYSQLND_ZTS(self);
 
 	if (!self->stream && FAIL == self->m->open(self, FALSE)) {
 		return FAIL;
@@ -165,7 +162,6 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
 	unsigned int flags = self->flags;
 	char pid_buffer[10], time_buffer[30], file_buffer[200],
 		 line_buffer[6], level_buffer[7];
-	MYSQLND_ZTS(self);
 
 	if (!self->stream && FAIL == self->m->open(self, FALSE)) {
 		return FAIL;
@@ -436,7 +432,6 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_debug, close)(MYSQLND_DEBUG * self)
 {
-	MYSQLND_ZTS(self);
 	if (self->stream) {
 #ifndef MYSQLND_PROFILING_DISABLED
 		if (!(self->flags & MYSQLND_DEBUG_FLUSH) && (self->flags & MYSQLND_DEBUG_PROFILE_CALLS)) {
@@ -719,7 +714,7 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC)
 {
 	MYSQLND_DEBUG *ret = calloc(1, sizeof(MYSQLND_DEBUG));
 #ifdef ZTS
-	ret->TSRMLS_C = TSRMLS_C;
+	ret->tsrm_ls = tsrm_get_ls_cache();
 #endif
 	ret->nest_level_limit = 0;
 	ret->pid = getpid();
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index bb4ff3e895..463c60cee3 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -46,7 +46,7 @@ struct st_mysqlnd_debug
 {
 	php_stream	*stream;
 #ifdef ZTS
-	TSRMLS_D;
+	void ***tsrm_ls;
 #endif
 	unsigned int flags;
 	unsigned int nest_level_limit;
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index f49143bc8c..ed5fedd547 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -197,7 +197,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
 #ifdef ZTS
 #	include "TSRM.h"
 #	define PHAR_G(v) TSRMG(phar_globals_id, zend_phar_globals *, v)
-#	define PHAR_GLOBALS ((zend_phar_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(phar_globals_id)])
+#	define PHAR_GLOBALS ((zend_phar_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(phar_globals_id)])
 #else
 #	define PHAR_G(v) (phar_globals.v)
 #	define PHAR_GLOBALS (&phar_globals)