From 31cc63b1a41dab5f70d778c86ec3e8e2f98e41ea Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 25 Sep 2014 20:02:48 +0200 Subject: fix some extension builds --- ext/mysqlnd/mysqlnd_debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_debug.h') 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; -- cgit v1.2.1 From 57dbe023649746b92bb85ff3114e6b10d26ca134 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 20:48:41 +0200 Subject: drop unused tsrm_ls --- ext/mysqlnd/mysqlnd_debug.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.h') diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 463c60cee3..e8dfeb6c4a 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -45,9 +45,6 @@ struct st_mysqlnd_debug_methods struct st_mysqlnd_debug { php_stream *stream; -#ifdef ZTS - void ***tsrm_ls; -#endif unsigned int flags; unsigned int nest_level_limit; int pid; -- 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/mysqlnd/mysqlnd_debug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.h') diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index e8dfeb6c4a..636172882d 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -62,13 +62,13 @@ struct st_mysqlnd_plugin_trace_log struct st_mysqlnd_plugin_header plugin_header; struct { - MYSQLND_DEBUG * (*trace_instance_init)(const char * skip_functions[] TSRMLS_DC); + MYSQLND_DEBUG * (*trace_instance_init)(const char * skip_functions[]); } methods; }; -void mysqlnd_debug_trace_plugin_register(TSRMLS_D); +void mysqlnd_debug_trace_plugin_register(void); -PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC); +PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[]); #if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 1400)) -- cgit v1.2.1