diff options
| author | Popa Adrian Marius <mapopa@gmail.com> | 2015-12-03 16:15:18 +0200 |
|---|---|---|
| committer | Popa Adrian Marius <mapopa@gmail.com> | 2015-12-03 16:15:18 +0200 |
| commit | 1745ead668a16f9f15abdbca971aaf9fb3e80946 (patch) | |
| tree | 62726a09c434b2606c4fb0c3de7abeb9750b53f5 | |
| parent | e322fb0015e0204a479b77cda6b8a75ed8ab86a7 (diff) | |
| parent | 4173a667fab0c77d1704a6b9d9a8e6ab1209ff72 (diff) | |
| download | php-git-1745ead668a16f9f15abdbca971aaf9fb3e80946.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
| -rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 5445368bc9..c48a4fa2bc 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -367,11 +367,11 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ break; case SQL_LONG: *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); - *len = slprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata); + *len = slprintf(*ptr, CHAR_BUF_LEN, "%d", *(ISC_LONG*)var->sqldata); break; case SQL_INT64: *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); - *len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata); + *len = slprintf(*ptr, CHAR_BUF_LEN, "%ld" LL_MASK "d", *(ISC_INT64*)var->sqldata); break; case SQL_FLOAT: *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); |