Merge branch 'v1.0.x'

[m6w6/ext-pq] / src / php_pq_callback.h

diff --git a/src/php_pq_callback.h b/src/php_pq_callback.h
index 412d5ed9327d8fc01308e846e2839c0fb41e694d..efcbd96d91045b3635db0028d408c171cd61c8d0 100644 (file)
--- a/src/php_pq_callback.h
+++ b/src/php_pq_callback.h
@@ -23,12 +23,13 @@ typedef struct php_pq_callback {
 
 extern void php_pq_callback_dtor(php_pq_callback_t *cb);
 extern void php_pq_callback_addref(php_pq_callback_t *cb);
-extern zval *php_pq_callback_to_zval(php_pq_callback_t *cb);
-extern zend_bool php_pq_callback_is_locked(php_pq_callback_t *cb TSRMLS_DC);
-extern void php_pq_callback_recurse(php_pq_callback_t *old, php_pq_callback_t *new TSRMLS_DC);
+extern zval *php_pq_callback_to_zval(php_pq_callback_t *cb, zval *tmp);
+extern zval *php_pq_callback_to_zval_no_addref(php_pq_callback_t *cb, zval *tmp);
+extern zend_bool php_pq_callback_is_locked(php_pq_callback_t *cb);
+extern void php_pq_callback_recurse(php_pq_callback_t *old, php_pq_callback_t *new);
 extern zend_bool php_pq_callback_is_enabled(php_pq_callback_t *cb);
-extern void php_pq_callback_disable(php_pq_callback_t *cb TSRMLS_DC);
-extern void php_pq_callback_recurse_ex(php_pq_callback_t *old, php_pq_callback_t *new TSRMLS_DC);
+extern void php_pq_callback_disable(php_pq_callback_t *cb);
+extern void php_pq_callback_recurse_ex(php_pq_callback_t *old, php_pq_callback_t *new);
 extern zend_bool php_pq_callback_is_recurrent(php_pq_callback_t *cb);
 
 #endif