com php-src: some more fixes to ext/pgsql: ext/pgsql/pgsql.c

Commit: 2fc14d515e710e8efc9e0492a9ec53da3fc1ba02 Author: Anatol Belski <ab@php.net> Tue, 3 Dec 2013 01:33:43 +0100 Parents: f7df15ea53b6a2b802abe7fc14941b0b80fb1338 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fc14d515e710e8efc9e0492a9ec53da3fc1ba02 Log: some more fixes to ext/pgsql Changed paths: M ext/pgsql/pgsql.c Diff: diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 763410a..2a65faf 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -46,6 +46,9 @@ #include "php_pgsql.h" #include "php_globals.h" #include "zend_exceptions.h" +#ifdef PHP_WIN32 +# include "win32/time.h" +#endif #if HAVE_PGSQL @@ -2609,9 +2612,9 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, php_int_t result_ char *element = PQgetvalue(pgsql_result, pgsql_row, i); if (element) { char *data; - int data_len; + zend_str_size_int data_len; int should_copy=0; - const uint element_len = strlen(element); + const zend_str_size_uint element_len = strlen(element); data = safe_estrndup(element, element_len); data_len = element_len; @@ -3367,7 +3370,7 @@ PHP_FUNCTION(pg_lo_write) php_int_t z_len; zend_str_size_int str_len; int nbytes; - int len; + zend_str_size_int len; pgLofp *pgsql; int argc = ZEND_NUM_ARGS(); @@ -4332,7 +4335,7 @@ static char* php_pgsql_PQescapeInternal(PGconn *conn, const char *str, size_t le char *result, *rp; const char *s; size_t tmp_len; - int input_len = len; + php_int_t input_len = len; char quote_char = escape_literal ? '\'' : '"'; if (!conn) {