X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.h;h=cc20ddbbc764e15524f71e0f494b40ac21c84611;hp=e0ed25ed7089c50a7c8c2c2e013783044bc4e624;hb=1e1d31873ad4283bd9acc3349107585f88161ea2;hpb=6e28a8741be3fccdaca960e492c31bc26837a4ed

diff --git a/src/php_pqres.h b/src/php_pqres.h
index e0ed25e..cc20ddb 100644
--- a/src/php_pqres.h
+++ b/src/php_pqres.h
@@ -48,27 +48,17 @@ typedef struct php_pqres {
 } php_pqres_t;
 
 typedef struct php_pqres_object {
-	php_pqres_t *intern;
-	HashTable *prophandler;
-	zend_object zo;
+	PHP_PQ_OBJ_DECL(php_pqres_t *)
 } php_pqres_object_t;
 
 extern ZEND_RESULT_CODE php_pqres_success(PGresult *res);
-extern void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *obj, php_pqres_object_t **ptr);
-extern zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr);
+extern php_pqres_object_t *php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *obj);
+extern zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval *data);
 extern zval *php_pqres_typed_zval(php_pqres_t *res, Oid typ, zval *zv);
 extern php_pqres_fetch_t php_pqres_fetch_type(php_pqres_t *res);
 
 #include "php_pq_object.h"
 #include "php_pqconn_event.h"
-#define PHP_PQclear(_r) do { \
-	php_pqres_object_t *_o = PQresultInstanceData((_r), php_pqconn_event); \
-	if (_o) { \
-		php_pq_object_delref(_o); \
-	} else { \
-		PQclear(_r); \
-	} \
-} while(0)
 
 extern zend_class_entry *php_pqres_class_entry;
 extern php_pqres_object_t *php_pqres_create_object_ex(zend_class_entry *ce, php_pqres_t *intern);