summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2011-09-01 12:04:54 +0000
committerJohannes Schlüter <johannes@php.net>2011-09-01 12:04:54 +0000
commit4eff96b99beaf32df292a4270dbf7a214b69cc34 (patch)
treec86beba97f66fa55eb15acbc116fb47c5e18fcac /ext
parent426b388b743b73840432693e20a541dd78bde22b (diff)
downloadphp-git-4eff96b99beaf32df292a4270dbf7a214b69cc34.tar.gz
- Fix TSRM build
Diffstat (limited to 'ext')
-rw-r--r--ext/mysql/php_mysql.c2
-rw-r--r--ext/mysqli/mysqli.c2
-rw-r--r--ext/mysqlnd/mysqlnd.c4
-rw-r--r--ext/mysqlnd/mysqlnd.h4
-rw-r--r--ext/mysqlnd/php_mysqlnd.c2
-rwxr-xr-xext/pdo_mysql/pdo_mysql.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 89fe7b15ff..5a576248b5 100644
--- 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 c94ddd03db..e5f3907ddc 100644
--- 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 5db03278dc..9b5cf46a87 100644
--- 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 760ee529f9..658b63062b 100644
--- 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 2f477c6c95..e687d1fc40 100644
--- 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 9bb9b1a684..a88a45736c 100755
--- 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);