Merge branch 'v1.0.x'

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

diff --git a/src/php_pqstm.h b/src/php_pqstm.h
index 07428593cb3f9b21dd13f93419758ea8d23fcfbf..79e6aa713514ef1e3573b33e206591080657d485 100644 (file)
--- a/src/php_pqstm.h
+++ b/src/php_pqstm.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2013, Michael Wallner <mike@php.net>                |
+    | Copyright (c) 2013, Michael Wallner <mike@php.net>                 |
     +--------------------------------------------------------------------+
 */
 
@@ -20,19 +20,21 @@ typedef struct php_pqstm {
        php_pqconn_object_t *conn;
        char *name;
        HashTable bound;
+       php_pq_params_t *params;
+       char *query;
+       unsigned allocated:1;
 } php_pqstm_t;
 
 typedef struct php_pqstm_object {
-       zend_object zo;
-       zend_object_value zv;
-       HashTable *prophandler;
-       php_pqstm_t *intern;
+       PHP_PQ_OBJ_DECL(php_pqstm_t *)
 } php_pqstm_object_t;
 
-zend_class_entry *php_pqstm_class_entry;
-zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, php_pqstm_t *intern, php_pqstm_object_t **ptr TSRMLS_DC);
+extern zend_class_entry *php_pqstm_class_entry;
+extern php_pqstm_object_t *php_pqstm_create_object_ex(zend_class_entry *ce, php_pqstm_t *intern);
+extern php_pqstm_t *php_pqstm_init(php_pqconn_object_t *conn, const char *name, const char *query, php_pq_params_t *params);
 
-PHP_MINIT_FUNCTION(pqstm);
+extern PHP_MINIT_FUNCTION(pqstm);
+extern PHP_MSHUTDOWN_FUNCTION(pqstm);
 
 #endif