_mingw.h: Do not check for _UCRT This fixes commit bfd33f6c0ec5e652cc9911857dd1492ece8d8383. _UCRT does not have to be defined yet (it is defined after including _mingw.h), but __MSVCRT_VERSION__ at this stage is always defined (few lines above). Signed-off-by: Liu Hao <lh_mouse@126.com>
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in index 460d932..c1caae6 100644 --- a/mingw-w64-headers/crt/_mingw.h.in +++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -421,8 +421,8 @@ * printf ll modifier (unsupported by msvcrt.dll) is required by C99 and C++11 standards. */ #if (defined (_POSIX) || defined (_POSIX_SOURCE) || defined (_POSIX_C_SOURCE) \ || defined (_ISOC99_SOURCE) \ - || (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(_UCRT)) \ - || (defined (__cplusplus) && __cplusplus >= 201103L && !defined(_UCRT)) \ + || (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && __MSVCRT_VERSION__ < 0xE00) \ + || (defined (__cplusplus) && __cplusplus >= 201103L && __MSVCRT_VERSION__ < 0xE00) \ || defined (_XOPEN_SOURCE) || defined (_XOPEN_SOURCE_EXTENDED) \ || defined (_GNU_SOURCE) \ || defined (_SVID_SOURCE)) \