diff options
| author | George Peter Banyard <girgias@php.net> | 2020-03-29 01:10:15 +0100 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-03-31 00:14:56 +0200 |
| commit | 457380cae7813a4a34faa1f9a49fa121395fe290 (patch) | |
| tree | a5c0b8a34894a881782ed0612279841776f8960f /ext/mysqli/php_mysqli_structs.h | |
| parent | aa47543cb46a14525a69dc64385019b6c1d8583b (diff) | |
| download | php-git-457380cae7813a4a34faa1f9a49fa121395fe290.tar.gz | |
Drop wchar header check as always defined since C95
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 02d97b29bc..0edf0871d6 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -39,29 +39,8 @@ #include "mysqli_mysqlnd.h" #else -/* - The libmysql headers (a PITA) also define it and there will be an warning. - Undef it and later we might need to define it again. -*/ -#ifdef HAVE_MBRLEN -#undef HAVE_MBRLEN -#define WE_HAD_MBRLEN -#endif -#ifdef HAVE_MBSTATE_T -#undef HAVE_MBSTATE_T -#define WE_HAD_MBSTATE_T -#endif - #include <my_global.h> -#if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) -#define HAVE_MBRLEN 1 -#endif - -#if !defined(HAVE_MBSTATE_T) && defined(WE_HAD_MBSTATE_T) -#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 |