finish port

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

diff --git a/src/php_pqres.h b/src/php_pqres.h
index e0ed25ed7089c50a7c8c2c2e013783044bc4e624..acc03ccabd357e5a4d536856f239c5236be4eb3b 100644 (file)
--- a/src/php_pqres.h
+++ b/src/php_pqres.h
@@ -48,14 +48,12 @@ 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);