Merge branch 'v1.0.x'

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

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index b25f871fdfcc38e49e91da186685080017a914cf..2fdb7e1432e76fc5832c90d965fcd4008f916885 100644 (file)
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -16,15 +16,6 @@
 
 #include <libpq-fe.h>
 
-#if PHP_VERSION_ID < 50500
-#undef SUCCESS
-#undef FAILURE
-typedef enum {
-       SUCCESS = 0,
-       FAILURE = -1
-} ZEND_RESULT_CODE;
-#endif
-
 #include "php_pqres.h"
 
 #define z_is_true zend_is_true
@@ -32,6 +23,17 @@ typedef enum {
 #define smart_str_v(ss) (ss)->s->val
 #define smart_str_l(ss) (ss)->s->len
 
+/* clear result object associated with a result handle */
+extern void php_pqres_clear(PGresult *r);
+/* clear any asynchronous results */
+extern void php_pqconn_clear(PGconn *conn);
+/* safe wrappers to clear any asynchronous wrappers before querying synchronously */
+extern PGresult *php_pq_exec(PGconn *conn, const char *query);
+extern PGresult *php_pq_exec_params(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat);
+extern PGresult *php_pq_prepare(PGconn *conn, const char *stmtName, const char *query, int nParams, const Oid *paramTypes);
+extern PGresult *php_pq_exec_prepared(PGconn *conn, const char *stmtName, int nParams, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat);
+
+
 /* trim LF from EOL */
 extern char *php_pq_rtrim(char *e);