Merge branch 'v1.1.x'

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

diff --git a/src/php_pqconn_event.h b/src/php_pqconn_event.h
index 85aeab4bc2aca9492a70b8d9360e763405046d92..b7513a67f8f83b85de03ca258a6aa70f1eb84297 100644 (file)
--- a/src/php_pqconn_event.h
+++ b/src/php_pqconn_event.h
@@ -17,18 +17,17 @@
 #include <libpq-events.h>
 
 #include "php_pqconn.h"
+#include "php_pqres.h"
 
 typedef struct php_pqconn_event_data {
        php_pqconn_object_t *obj;
-#ifdef ZTS
-       void ***ts;
-#endif
+       php_pqres_object_t *res;
 } php_pqconn_event_data_t;
 
-php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj TSRMLS_DC);
-void php_pqconn_notice_recv(void *p, const PGresult *res);
-void php_pqconn_notice_ignore(void *p, const PGresult *res);
-int php_pqconn_event(PGEventId id, void *e, void *data);
+extern php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj);
+extern void php_pqconn_notice_recv(void *p, const PGresult *res);
+extern void php_pqconn_notice_ignore(void *p, const PGresult *res);
+extern int php_pqconn_event(PGEventId id, void *e, void *data);
 
 #endif