Merge branch 'v1.0.x'

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

diff --git a/src/php_pqlob.h b/src/php_pqlob.h
index 2d4371846b79f6ff719745702da19ffe8e76e1d2..fc7fa137de28f8d86c1a0f3a2f6db9757df8816e 100644 (file)
--- a/src/php_pqlob.h
+++ b/src/php_pqlob.h
@@ -19,22 +19,19 @@
 typedef struct php_pqlob {
        int lofd;
        Oid loid;
-       int stream;
+       php_stream *stream;
        php_pqtxn_object_t *txn;
 } php_pqlob_t;
 
 typedef struct php_pqlob_object {
-       zend_object zo;
-       zend_object_value zv;
-       HashTable *prophandler;
-       php_pqlob_t *intern;
+       PHP_PQ_OBJ_DECL(php_pqlob_t *)
 } php_pqlob_object_t;
 
-zend_class_entry *php_pqlob_class_entry;
-zend_object_value php_pqlob_create_object_ex(zend_class_entry *ce, php_pqlob_t *intern, php_pqlob_object_t **ptr TSRMLS_DC);
+extern zend_class_entry *php_pqlob_class_entry;
+extern php_pqlob_object_t *php_pqlob_create_object_ex(zend_class_entry *ce, php_pqlob_t *intern);
 
-PHP_MINIT_FUNCTION(pqlob);
-PHP_MSHUTDOWN_FUNCTION(pqlob);
+extern PHP_MINIT_FUNCTION(pqlob);
+extern PHP_MSHUTDOWN_FUNCTION(pqlob);
 
 #endif