diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/pgsql/php_pgsql.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/pgsql/php_pgsql.h')
| -rw-r--r-- | ext/pgsql/php_pgsql.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index 661c02f77f..4c50666e12 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -210,29 +210,29 @@ PHP_FUNCTION(pg_select); /* exported functions */ -PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta, zend_bool extended TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval *values, zval *result, zend_ulong opt TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *values, zend_ulong opt, zend_string **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *values, zval *ids, zend_ulong opt , zend_string **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids, zend_ulong opt, zend_string **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids, zval *ret_array, zend_ulong opt, zend_string **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta, zend_bool extended); +PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval *values, zval *result, zend_ulong opt); +PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *values, zend_ulong opt, zend_string **sql); +PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *values, zval *ids, zend_ulong opt , zend_string **sql); +PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids, zend_ulong opt, zend_string **sql); +PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids, zval *ret_array, zend_ulong opt, zend_string **sql ); +PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array); /* internal functions */ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent); static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type); static void php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type); -static char *get_field_name(PGconn *pgsql, Oid oid, HashTable *list TSRMLS_DC); +static char *get_field_name(PGconn *pgsql, Oid oid, HashTable *list); static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type); static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type); static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS,int entry_type); -static size_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC); -static size_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count TSRMLS_DC); -static int php_pgsql_fd_close(php_stream *stream, int close_handle TSRMLS_DC); -static int php_pgsql_fd_flush(php_stream *stream TSRMLS_DC); -static int php_pgsql_fd_set_option(php_stream *stream, int option, int value, void *ptrparam TSRMLS_DC); -static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret TSRMLS_DC); +static size_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count); +static size_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count); +static int php_pgsql_fd_close(php_stream *stream, int close_handle); +static int php_pgsql_fd_flush(php_stream *stream); +static int php_pgsql_fd_set_option(php_stream *stream, int option, int value, void *ptrparam); +static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret); typedef enum _php_pgsql_data_type { /* boolean */ @@ -322,7 +322,10 @@ ZEND_END_MODULE_GLOBALS(pgsql) ZEND_EXTERN_MODULE_GLOBALS(pgsql) #ifdef ZTS -# define PGG(v) TSRMG(pgsql_globals_id, zend_pgsql_globals *, v) +# define PGG(v) ZEND_TSRMG(pgsql_globals_id, zend_pgsql_globals *, v) +# ifdef COMPILE_DL_PGSQL +ZEND_TSRMLS_CACHE_EXTERN; +# endif #else # define PGG(v) (pgsql_globals.v) #endif |