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/mysqli/php_mysqli_structs.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/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 96fbacb82e..8afef8736a 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -54,8 +54,6 @@ #define WE_HAD_MBSTATE_T #endif -#include <my_global.h> - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) #define HAVE_MBRLEN 1 #endif @@ -64,20 +62,12 @@ #define HAVE_MBSTATE_T 1 #endif -/* - We need more than mysql.h because we need CHARSET_INFO in one place. - This order has been borrowed from the ODBC driver. Nothing can be removed - from the list of headers :( -*/ - -#include <my_sys.h> #include <mysql.h> +#if MYSQL_VERSION_ID >= 80000 && MYSQL_VERSION_ID < 100000 +typedef _Bool my_bool; +#endif #include <errmsg.h> -#include <my_list.h> -#include <m_string.h> #include <mysqld_error.h> -#include <my_list.h> -#include <m_ctype.h> #include "mysqli_libmysql.h" #endif /* MYSQLI_USE_MYSQLND */ |