better checks for json support

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

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index 0ba99a2b8f88c6e362313c1322098d599a9cda0d..2e116d77eba843031af6421f3bd653d025943c1c 100644 (file)
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -18,6 +18,15 @@
 
 typedef int STATUS; /* SUCCESS/FAILURE */
 
 
 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);
 
 /* trim LF from EOL */
 char *rtrim(char *e);
 


@@ -32,11 +41,12 @@ int compare_index(const void *lptr, const void *rptr 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);
 
 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);

+void php_pqdt_to_string(zval *zdt, const char *format, char **str_buf, size_t *str_len TSRMLS_DC);

 
 zend_class_entry *php_pqconv_class_entry;
 
 
 zend_class_entry *php_pqconv_class_entry;
 

-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);
+HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ TSRMLS_DC);
+

 
 PHP_MINIT_FUNCTION(pq_misc);
 
 
 PHP_MINIT_FUNCTION(pq_misc);