diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index 8b6506e771..ea2611c19c 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 2006-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -42,11 +42,11 @@ 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; \ - } + } #else #define MYSQLND_STAT_CALL_TRIGGER(s_array, statistic, val) #endif /* MYSQLND_CORE_STATISTICS_TRIGGERS_DISABLED */ @@ -147,7 +147,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #else -#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) +#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) #define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) #define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) #define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) @@ -157,13 +157,13 @@ 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); -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 */ |