Merge branch 'v1.1.x'

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

diff --git a/src/php_pqconn.h b/src/php_pqconn.h
index 0514e0a6cda6447ce0e9e46964f746adf318c12a..775451f43f7d3734ef9e9ee88f0418994e24d53a 100644 (file)
--- a/src/php_pqconn.h
+++ b/src/php_pqconn.h
@@ -18,7 +18,9 @@
 #define PHP_PQCONN_PERSISTENT 0x02
 
 #include <ext/raphf/php_raphf.h>
+#include "php_pq_object.h"
 #include "php_pq_callback.h"
+#include "php_pq_object.h"
 #include "php_pq_params.h"
 
 typedef struct php_pqconn {
@@ -26,6 +28,7 @@ typedef struct php_pqconn {
        int (*poller)(PGconn *);
        php_resource_factory_t factory;
        HashTable listeners;
+       HashTable statements;
        HashTable converters;
        HashTable eventhandlers;
        php_pq_callback_t onevent;
@@ -38,9 +41,7 @@ typedef struct php_pqconn {
 } php_pqconn_t;
 
 typedef struct php_pqconn_object {
-       php_pqconn_t *intern;
-       HashTable *prophandler;
-       zend_object zo;
+       PHP_PQ_OBJ_DECL(php_pqconn_t *)
 } php_pqconn_object_t;
 
 typedef struct php_pqconn_resource_factory_data {