- Fix TSRM build

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 89fe7b15ff832f61124fa85d10b9f5fd5f03eccf..5a576248b5d051350b0c6419419a9978cc969a10 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -530,7 +530,7 @@ static PHP_GINIT_FUNCTION(mysql)
 /* }}} */
 
 #ifdef MYSQL_USE_MYSQLND
-static MYSQLND *mysql_convert_zv_to_mysqlnd(zval *zv)
+static MYSQLND *mysql_convert_zv_to_mysqlnd(zval *zv TSRMLS_DC)
 {
        php_mysql_conn *mysql;
 

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c94ddd03db06cdc11d19d63038d7e626153dc31f..e5f3907ddc8ec4d135b0745bd9454be3b3b8d8ef 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -528,7 +528,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 /* }}} */
 
 #ifdef MYSQLI_USE_MYSQLND
-static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval *zv)
+static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval *zv TSRMLS_DC)
 {
        if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == mysqli_link_class_entry) {
                MY_MYSQL *mysql;

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 5db03278dc35b5db05ba8d887744059210db2c12..9b5cf46a877910a406eb310f6a45da30ca112044 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2565,7 +2565,7 @@ PHPAPI void mysqlnd_register_api_extension(mysqlnd_api_extension_t *apiext)
 /* }}} */
 
 /* {{{ zval_to_mysqlnd */
-PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv)
+PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv TSRMLS_DC)
 {
        MYSQLND* retval;
        mysqlnd_api_extension_t **elem;
@@ -2574,7 +2574,7 @@ PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv)
                        zend_hash_get_current_data(&mysqlnd_api_ext_ht, (void **)&elem) == SUCCESS;
                        zend_hash_move_forward(&mysqlnd_api_ext_ht)) {
                if ((*elem)->conversion_cb) {
-                       retval = (*elem)->conversion_cb(zv);
+                       retval = (*elem)->conversion_cb(zv TSRMLS_CC);
                        if (retval) {
                                return retval;
                        }

diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 760ee529f9dbe1a5c370f7e7d83caf01d8b2fb9c..658b63062b6481444d1988a463c26c3721983754 100644 (file)
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -312,12 +312,12 @@ PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 
 typedef struct {
        zend_module_entry *module;
-       MYSQLND *(*conversion_cb)(zval *zv);
+       MYSQLND *(*conversion_cb)(zval *zv TSRMLS_DC);
 } mysqlnd_api_extension_t;
 
 PHPAPI HashTable *mysqlnd_get_api_extensions();
 PHPAPI void mysqlnd_register_api_extension(mysqlnd_api_extension_t *apiext);
-PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv);
+PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv TSRMLS_DC);
 
 #endif /* MYSQLND_H */
 

diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 2f477c6c953e5525714f9bfda3ebbeecf4995d3c..e687d1fc407fb5b6a995ce6ab53a53c259d398e9 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -188,7 +188,7 @@ PHP_MINFO_FUNCTION(mysqlnd)
                php_info_print_table_row(2, "Loaded plugins", tmp_str.c);
                smart_str_free(&tmp_str);
 
-               zend_hash_apply_with_argument(mysqlnd_get_api_extensions(), mysqlnd_minfo_dump_api_plugins, &tmp_str);
+               zend_hash_apply_with_argument(mysqlnd_get_api_extensions(), mysqlnd_minfo_dump_api_plugins, &tmp_str TSRMLS_CC);
                smart_str_0(&tmp_str);
                php_info_print_table_row(2, "API Extensions", tmp_str.c);
                smart_str_free(&tmp_str);

diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 9bb9b1a684be8f17e25b6d19724af4ff16445a32..a88a45736ceb5048ddcf653b64e82a240ea518cb 100755 (executable)
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -48,7 +48,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
 #endif
 
 #ifdef PDO_USE_MYSQLND
-static MYSQLND *pdo_mysql_convert_zv_to_mysqlnd(zval *zv)
+static MYSQLND *pdo_mysql_convert_zv_to_mysqlnd(zval *zv TSRMLS_DC)
 {
        if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == php_pdo_get_dbh_ce()) {
                pdo_dbh_t *dbh = zend_object_store_get_object(zv TSRMLS_CC);