X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.h;h=9fc086a21c40add13532f0ea881bd869ac32ff8c;hp=b7438de45186a6bc0ebebc19e253216d2d34acc1;hb=d3fbce1b02b41d7ee1f3d0b60dc8df411aae7d79;hpb=9e37136f3b7f6d2d2d35b5626cd56dab0d5acce3

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index b7438de..9fc086a 100644
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -16,29 +16,46 @@
 
 #include <libpq-fe.h>
 
-typedef int STATUS; /* SUCCESS/FAILURE */
+#if PHP_VERSION_ID < 50500
+#undef SUCCESS
+#undef FAILURE
+typedef enum {
+	SUCCESS = 0,
+	FAILURE = -1
+} ZEND_RESULT_CODE;
+#endif
+
+#include "php_pqres.h"
+
+/* TSRM morony */
+#if PHP_VERSION_ID >= 50700
+#	define z_is_true(z) zend_is_true(z TSRMLS_CC)
+#else
+#	define z_is_true zend_is_true
+#endif
 
 /* trim LF from EOL */
-char *rtrim(char *e);
+extern char *php_pq_rtrim(char *e);
 
 /* R, W, RW */
-const char *strmode(long mode);
+extern const char *php_pq_strmode(long mode);
 
 /* compare array index */
-int compare_index(const void *lptr, const void *rptr TSRMLS_DC);
+extern int php_pq_compare_index(const void *lptr, const void *rptr TSRMLS_DC);
+
+#define PHP_PQerrorMessage(c) php_pq_rtrim(PQerrorMessage((c)))
+#define PHP_PQresultErrorMessage(r) php_pq_rtrim(PQresultErrorMessage((r)))
 
-#define PHP_PQerrorMessage(c) rtrim(PQerrorMessage((c)))
-#define PHP_PQresultErrorMessage(r) rtrim(PQresultErrorMessage((r)))
+extern zend_class_entry *php_pqdt_class_entry;
+extern zval *php_pqdt_from_string(zval *zv, char *input_fmt, char *dt_str, size_t dt_len, char *output_fmt, zval *ztimezone TSRMLS_DC);
+extern void php_pqdt_to_string(zval *zdt, const char *format, char **str_buf, size_t *str_len TSRMLS_DC);
 
-int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC);
-int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC);
+extern zend_class_entry *php_pqconv_class_entry;
 
-zend_class_entry *php_pqdt_class_entry;
-zval *php_pqdt_from_string(char *datetime_str, size_t datetime_len, char *fmt, zval *zv TSRMLS_DC);
+extern HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ TSRMLS_DC);
 
-HashTable *php_pq_parse_array(const char *val_str, size_t val_len TSRMLS_DC);
 
-PHP_MINIT_FUNCTION(pq_misc);
+extern PHP_MINIT_FUNCTION(pq_misc);
 
 #endif