diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:35:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:35:03 +0200 |
| commit | 3ad57f9f315f0d1dabcb75d18eff60e835b2ff63 (patch) | |
| tree | 4a9c7f987812d07a0acbb02787ce40c9a8c2a596 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | 8d37c37bcdbf6fa99cd275413342457eeb2c664e (diff) | |
| parent | d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f (diff) | |
| download | php-git-3ad57f9f315f0d1dabcb75d18eff60e835b2ff63.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
pdo_mysql/mysqli (native) libmysqlclient_r no-longer used
mysql: native mysql-8.0 uses _Bool
mysqli: use native api
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 4abb25bddc..3957a6c824 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -25,6 +25,9 @@ # define PDO_MYSQL_PARAM_BIND MYSQLND_PARAM_BIND #else # include <mysql.h> +#if MYSQL_VERSION_ID >= 80000 && MYSQL_VERSION_ID < 100000 +typedef _Bool my_bool; +#endif # define PDO_MYSQL_PARAM_BIND MYSQL_BIND #endif |