diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-27 18:48:09 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-27 18:48:09 +0200 |
| commit | 3464929d6459b7aafa3349ab5c675a412c694cd3 (patch) | |
| tree | a0fdf3f280f93a9fad365c40f6a311aa669c8aab | |
| parent | 2371c65a283c441efdb5a9b35b40b9b1b9410233 (diff) | |
| parent | e561d4100b65ed064af6ffc2c45a500f960b49ca (diff) | |
| download | php-git-3464929d6459b7aafa3349ab5c675a412c694cd3.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77944: Wrong meta pdo_type for bigint on LLP64
| -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 ea4b13a5d2..a16324aa18 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); |