diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-12-06 10:24:27 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-12-06 10:24:27 +0100 |
| commit | b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31 (patch) | |
| tree | 7e38f875389865e1efea584ede8d4c0e6fcbd062 /ext | |
| parent | 381fd62ccf9ee6889c964c2be6cf1712a9ac4562 (diff) | |
| parent | 625b929c6eb222773d175bd22a7b893165b960fd (diff) | |
| download | php-git-b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix compilation error (ref #68424)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo_mysql/pdo_mysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 50da0ba783..cabbc8f572 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -124,9 +124,9 @@ static PHP_MINIT_FUNCTION(pdo_mysql) REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER); #if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) - REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY); + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY); #endif - REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS); + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (long)PDO_MYSQL_ATTR_MULTI_STATEMENTS); #ifdef PDO_USE_MYSQLND mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api TSRMLS_CC); |