diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-23 18:30:24 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-23 18:30:24 +0200 |
| commit | 20580a511c029582fd2be6c8efbed40c89f7a874 (patch) | |
| tree | 3d28a74610fe98795de4d57b5a008b478b1e6f08 | |
| parent | bd9f5755172e0c73153a1286480b0e2a31908d7f (diff) | |
| download | php-git-20580a511c029582fd2be6c8efbed40c89f7a874.tar.gz | |
Fix ZTS build
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 6 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index c93bec7994..2ac26897b4 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 9888b26281..f5449ca943 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; |