X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.h;h=7c42319853b8ff89e07097f3ab30a333c729a175;hp=0ba99a2b8f88c6e362313c1322098d599a9cda0d;hb=a5470139f5305341fca92f942852d1ae18b254ea;hpb=88440266c0a9fa8354688b5ed0d2a6cc3bf04db5

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index 0ba99a2..7c42319 100644
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -18,27 +18,37 @@
 
 typedef int STATUS; /* SUCCESS/FAILURE */
 
+#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(char *datetime_str, size_t datetime_len, char *fmt, zval *zv TSRMLS_DC);
+extern void php_pqdt_to_string(zval *zdt, const char *format, char **str_buf, size_t *str_len TSRMLS_DC);
 
-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 zend_class_entry *php_pqconv_class_entry;
 
-zend_class_entry *php_pqconv_class_entry;
+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, Oid typ TSRMLS_DC);
-zval *php_pq_typed_zval(char *val_str, size_t val_len, Oid typ TSRMLS_DC);
 
-PHP_MINIT_FUNCTION(pq_misc);
+extern PHP_MINIT_FUNCTION(pq_misc);
 
 #endif