Merge branch 'v1.0.x'

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

diff --git a/src/php_pqtxn.h b/src/php_pqtxn.h
index 36f30b27e075d79be38ac1a0ec78f18adaa3fad3..82e497018b1974c645e45c9158536363a924f105 100644 (file)
--- a/src/php_pqtxn.h
+++ b/src/php_pqtxn.h
@@ -32,18 +32,16 @@ typedef struct php_pqtxn {
 } php_pqtxn_t;
 
 typedef struct php_pqtxn_object {
-       zend_object zo;
-       zend_object_value zv;
-       HashTable *prophandler;
-       php_pqtxn_t *intern;
+       PHP_PQ_OBJ_DECL(php_pqtxn_t *)
 } php_pqtxn_object_t;
 
-const char *isolation_level(long *isolation);
+extern const char *php_pq_isolation_level(long *isolation);
 
-zend_class_entry *php_pqtxn_class_entry;
-zend_object_value php_pqtxn_create_object_ex(zend_class_entry *ce, php_pqtxn_t *intern, php_pqtxn_object_t **ptr TSRMLS_DC);
+extern zend_class_entry *php_pqtxn_class_entry;
+extern php_pqtxn_object_t *php_pqtxn_create_object_ex(zend_class_entry *ce, php_pqtxn_t *intern);
 
-PHP_MINIT_FUNCTION(pqtxn);
+extern PHP_MINIT_FUNCTION(pqtxn);
+extern PHP_MSHUTDOWN_FUNCTION(pqtxn);
 
 #endif