johannes Thu, 01 Sep 2011 12:04:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315975
Log:
- Fix TSRM build
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
U php/php-src/trunk/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
U php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-09-01 12:04:43 UTC
(rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-09-01 12:04:54 UTC
(rev 315975)
@@ -530,7 +530,7 @@
/* }}} */
#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;
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-01 12:04:43 UTC
(rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-01 12:04:54 UTC
(rev 315975)
@@ -528,7 +528,7 @@
/* }}} */
#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;
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-09-01 12:04:43 UTC
(rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-09-01 12:04:54 UTC
(rev 315975)
@@ -2565,7 +2565,7 @@
/* }}} */
/* {{{ 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 @@
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;
}
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.h 2011-09-01 12:04:43 UTC
(rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.h 2011-09-01 12:04:54 UTC
(rev 315975)
@@ -312,12 +312,12 @@
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 */
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c 2011-09-01
12:04:43 UTC (rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c 2011-09-01
12:04:54 UTC (rev 315975)
@@ -188,7 +188,7 @@
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);
Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-09-01
12:04:43 UTC (rev 315974)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-09-01
12:04:54 UTC (rev 315975)
@@ -48,7 +48,7 @@
#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);
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-09-01 12:04:54 UTC (rev
315975)
@@ -530,7 +530,7 @@
/* }}} */
#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;
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-01 12:04:54 UTC (rev
315975)
@@ -528,7 +528,7 @@
/* }}} */
#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;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-01 12:04:54 UTC (rev
315975)
@@ -2565,7 +2565,7 @@
/* }}} */
/* {{{ 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 @@
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;
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-09-01 12:04:54 UTC (rev
315975)
@@ -312,12 +312,12 @@
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 */
Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2011-09-01 12:04:54 UTC (rev
315975)
@@ -188,7 +188,7 @@
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);
Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-09-01 12:04:43 UTC (rev
315974)
+++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-09-01 12:04:54 UTC (rev
315975)
@@ -48,7 +48,7 @@
#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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
