X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.h;h=919892952e0576d8e7314f1ddc95ad2af13da1e3;hp=07f75a34dda611b26f735edc1c0b88b1b2e310e8;hb=bf2e263195f9909b017fcf93d96cfc83a97ad2e3;hpb=8f0022e027a5412e5d404ee62a0c0346481748b4 diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h index 07f75a3..9198929 100644 --- a/src/php_pq_misc.h +++ b/src/php_pq_misc.h @@ -18,6 +18,13 @@ typedef int STATUS; /* SUCCESS/FAILURE */ +/* 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); @@ -30,12 +37,11 @@ int compare_index(const void *lptr, const void *rptr TSRMLS_DC); #define PHP_PQerrorMessage(c) rtrim(PQerrorMessage((c))) #define PHP_PQresultErrorMessage(r) rtrim(PQresultErrorMessage((r))) -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); - 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_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);