diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-27 18:46:57 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-27 18:47:32 +0200 |
| commit | e561d4100b65ed064af6ffc2c45a500f960b49ca (patch) | |
| tree | d39160b00edc5bd5e20ea92f94e1fbb4415d3c57 /ext/pdo_mysql/mysql_statement.c | |
| parent | 70239ea1d34bd2e2655e53bc892f44227ef9c697 (diff) | |
| parent | 16609880f8338134db08daf6bdcc42025f938fcd (diff) | |
| download | php-git-e561d4100b65ed064af6ffc2c45a500f960b49ca.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77944: Wrong meta pdo_type for bigint on LLP64
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 5e861089a0..df66a4023f 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -874,7 +874,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *retu case MYSQL_TYPE_SHORT: case MYSQL_TYPE_INT24: case MYSQL_TYPE_LONG: -#if SIZEOF_LONG==8 +#if SIZEOF_ZEND_LONG==8 case MYSQL_TYPE_LONGLONG: #endif add_assoc_long(return_value, "pdo_type", PDO_PARAM_INT); |