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_statistics.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_statistics.h') diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index bfc316ec59..db83dda4cb 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -42,7 +42,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; (s_array)->in_trigger = TRUE; \ MYSQLND_STATS_UNLOCK((s_array)); \ \ - (s_array)->triggers[(statistic)]((s_array), (statistic), (val) TSRMLS_CC); \ + (s_array)->triggers[(statistic)]((s_array), (statistic), (val)); \ \ MYSQLND_STATS_LOCK((s_array)); \ (s_array)->in_trigger = FALSE; \ @@ -162,8 +162,8 @@ PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYS PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count); PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats); -PHPAPI mysqlnd_stat_trigger mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats stat, mysqlnd_stat_trigger trigger TSRMLS_DC); -PHPAPI mysqlnd_stat_trigger mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats TSRMLS_DC); +PHPAPI mysqlnd_stat_trigger mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats stat, mysqlnd_stat_trigger trigger); +PHPAPI mysqlnd_stat_trigger mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats); #endif /* MYSQLND_STATISTICS_H */ -- cgit v1.2.1 From e112f6a04e0cddc6276c426c09c0249201878f5a Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 14 Dec 2014 14:07:59 +0100 Subject: second shot on removing TSRMLS_* --- ext/mysqlnd/mysqlnd_statistics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_statistics.h') diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index db83dda4cb..e151148396 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -157,7 +157,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #endif /* MYSQLND_CORE_STATISTICS_DISABLED */ -PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value ZEND_FILE_LINE_DC); PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count); PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats); -- cgit v1.2.1