diff options
Diffstat (limited to 'ext/pgsql/php_pgsql.h')
| -rw-r--r-- | ext/pgsql/php_pgsql.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index f484df41fc..a6c884d912 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -34,9 +34,8 @@ extern zend_module_entry pgsql_module_entry; #undef SOCKET_SIZE_TYPE #include <libpq-fe.h> +#include <libpq/libpq-fs.h> #ifdef PHP_WIN32 -#define INV_WRITE 0x00020000 -#define INV_READ 0x00040000 #undef PHP_PGSQL_API #ifdef PGSQL_EXPORTS #define PHP_PGSQL_API __declspec(dllexport) @@ -44,7 +43,6 @@ extern zend_module_entry pgsql_module_entry; #define PHP_PGSQL_API __declspec(dllimport) #endif #else -#include <libpq/libpq-fs.h> # if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_PGSQL_API __attribute__ ((visibility("default"))) # else @@ -53,6 +51,7 @@ extern zend_module_entry pgsql_module_entry; #endif #ifdef HAVE_PG_CONFIG_H +#undef SIZEOF_OFF_T #include <pg_config.h> #endif @@ -198,7 +197,7 @@ PHP_FUNCTION(pg_select); #define PGSQL_CONNECT_FORCE_NEW (1<<1) #define PGSQL_CONNECT_ASYNC (1<<2) /* php_pgsql_convert options */ -#define PGSQL_CONV_IGNORE_DEFAULT (1<<1) /* Do not use DEAFULT value by removing field from returned array */ +#define PGSQL_CONV_IGNORE_DEFAULT (1<<1) /* Do not use DEFAULT value by removing field from returned array */ #define PGSQL_CONV_FORCE_NULL (1<<2) /* Convert to NULL if string is null string */ #define PGSQL_CONV_IGNORE_NOT_NULL (1<<3) /* Ignore NOT NULL constraints */ #define PGSQL_CONV_OPTS (PGSQL_CONV_IGNORE_DEFAULT|PGSQL_CONV_FORCE_NULL|PGSQL_CONV_IGNORE_NOT_NULL) @@ -227,8 +226,8 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ 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); -static size_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count); +static ssize_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count); +static ssize_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); |