com php-src: Fix ZTS build: ext/opcache/zend_accelerator_ut il_funcs.c ext/sqlite3/sqlite3.c
| From: | Dmitry Stogov | Date: | Wed, 23 Apr 2014 16:30:24 +0000 |
| Subject: | com php-src: Fix ZTS build: ext/opcache/zend_accelerator_ut il_funcs.c ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77307@lists.php.net to get a copy of this message | ||
Commit: 20580a511c029582fd2be6c8efbed40c89f7a874
Author: Nikita Popov <nikic@php.net> Wed, 23 Apr 2014 18:30:24 +0200
Parents: bd9f5755172e0c73153a1286480b0e2a31908d7f
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20580a511c029582fd2be6c8efbed40c89f7a874
Log:
Fix ZTS build
Changed paths:
M ext/opcache/zend_accelerator_util_funcs.c
M ext/sqlite3/sqlite3.c
Diff:
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index c93bec7..2ac2689 100644
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -299,7 +299,7 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC)
if (bind && Z_REFCOUNT_P(src) > 1) {
accel_xlat_set(old, Z_REF_P(src));
}
- zend_clone_zval(Z_REFVAL_P(src), bind TSRMLS_C);
+ zend_clone_zval(Z_REFVAL_P(src), bind TSRMLS_CC);
}
break;
case IS_CONSTANT_AST:
@@ -330,7 +330,7 @@ static zend_ast *zend_ast_clone(zend_ast *ast TSRMLS_DC)
node->kind = ZEND_CONST;
node->children = 0;
ZVAL_COPY_VALUE(&node->u.val, &ast->u.val);
- zend_clone_zval(&node->u.val, 0);
+ zend_clone_zval(&node->u.val, 0 TSRMLS_CC);
} else {
node = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1));
node->kind = ast->kind;
@@ -412,7 +412,7 @@ static void zend_hash_clone_zval(HashTable *ht, HashTable *source, int bind)
/* Copy data */
ZVAL_COPY_VALUE(&q->val, &p->val);
- zend_clone_zval(&q->val, bind TSRMLS_C);
+ zend_clone_zval(&q->val, bind TSRMLS_CC);
}
}
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 9888b26..f5449ca 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -535,7 +535,7 @@ PHP_METHOD(sqlite3, query)
stmt_obj->initialised = 1;
object_init_ex(return_value, php_sqlite3_result_entry);
- result = Z_SQLITE3_RESULT_P(return_value TSRMLS_CC);
+ result = Z_SQLITE3_RESULT_P(return_value);
result->db_obj = db_obj;
result->stmt_obj = stmt_obj;
ZVAL_COPY_VALUE(&result->stmt_obj_zval, &stmt);
@@ -1531,7 +1531,7 @@ PHP_METHOD(sqlite3stmt, execute)
{
sqlite3_reset(stmt_obj->stmt);
object_init_ex(return_value, php_sqlite3_result_entry);
- result = Z_SQLITE3_RESULT_P(return_value TSRMLS_CC);
+ result = Z_SQLITE3_RESULT_P(return_value);
result->is_prepared_statement = 1;
result->db_obj = stmt_obj->db_obj;