diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:32:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:32:01 +0200 |
| commit | d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f (patch) | |
| tree | 94857e5c1d6e6b8a531d673915ffd207a3e3c1f4 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | f0d2efbadcab95596679e2f78e204299c96ad9b4 (diff) | |
| parent | 1aab7db6c870441046007c792c7fc5ecdff2ea51 (diff) | |
| download | php-git-d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 edded8dea9..a5b8653918 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -27,6 +27,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 |