X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pq_misc.h;h=afc017b162e8e398e8b7db970227fa42bb019d25;hb=7e123e705dfcfd74aad88ac569a80b32a97a5e64;hp=919892952e0576d8e7314f1ddc95ad2af13da1e3;hpb=bf2e263195f9909b017fcf93d96cfc83a97ad2e3;p=m6w6%2Fext-pq diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h index 9198929..afc017b 100644 --- a/src/php_pq_misc.h +++ b/src/php_pq_misc.h @@ -18,6 +18,8 @@ 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) @@ -26,26 +28,27 @@ typedef int STATUS; /* SUCCESS/FAILURE */ #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); -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