diff options
| author | Matteo Beccati <mbeccati@php.net> | 2013-08-21 11:24:27 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2013-08-21 11:24:27 +0200 |
| commit | 4283f75c347a105e53ae38fc96e614671df53f1b (patch) | |
| tree | c3f345fb2e95e71b6b1e3bc9e6be8fc023da10b5 /ext/pdo_pgsql/pgsql_statement.c | |
| parent | 7be3c743392fbf1837760393403c7b703e502d3a (diff) | |
| parent | 540f325664a6f4975cf005f367c95ece04757714 (diff) | |
| download | php-git-4283f75c347a105e53ae38fc96e614671df53f1b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 3ef89196de..792ad27078 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -536,7 +536,7 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned *len = 0; return 0; } else { - char *tmp_ptr = PQunescapeBytea(*ptr, &tmp_len); + char *tmp_ptr = (char *)PQunescapeBytea((unsigned char *)*ptr, &tmp_len); if (!tmp_ptr) { /* PQunescapeBytea returned an error */ *len = 0; |