headers: Replace checks for __MSVCRT_VERSION__ against 0x1400 with _UCRT Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-headers/crt/_mingw_stat64.h b/mingw-w64-headers/crt/_mingw_stat64.h index 00b68ce..1238580 100644 --- a/mingw-w64-headers/crt/_mingw_stat64.h +++ b/mingw-w64-headers/crt/_mingw_stat64.h
@@ -4,7 +4,7 @@ #define _fstat _fstat32 #define _stat _stat32 #define _wstat _wstat32 -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _fstati64 _fstat32i64 #define _stati64 _stat32i64 #define _wstati64 _wstat32i64
diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h index 5a90de2..363203c 100644 --- a/mingw-w64-headers/crt/conio.h +++ b/mingw-w64-headers/crt/conio.h
@@ -8,7 +8,7 @@ #include <crtdefs.h> -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -41,7 +41,7 @@ _CRTIMP int __cdecl _getche(void); _CRTIMP int __cdecl _kbhit(void); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __conio_common_vcprintf(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcprintf_p(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcprintf_s(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); @@ -161,7 +161,7 @@ _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); _CRTIMP int __cdecl _cputws(const wchar_t *_String); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __conio_common_vcwprintf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcwprintf_p(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcwprintf_s(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -258,7 +258,7 @@ #ifndef NO_OLDNAMES char *__cdecl cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 { __builtin_va_list _ArgList;
diff --git a/mingw-w64-headers/crt/corecrt.h b/mingw-w64-headers/crt/corecrt.h index e7078d6..f10ce5b 100644 --- a/mingw-w64-headers/crt/corecrt.h +++ b/mingw-w64-headers/crt/corecrt.h
@@ -454,7 +454,7 @@ #ifndef _THREADLOCALEINFO #define _THREADLOCALEINFO typedef struct threadlocaleinfostruct { -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT const unsigned short *_locale_pctype; int _locale_mb_cur_max; unsigned int _locale_lc_codepage;
diff --git a/mingw-w64-headers/crt/ctype.h b/mingw-w64-headers/crt/ctype.h index 3a1a64e..9d09833 100644 --- a/mingw-w64-headers/crt/ctype.h +++ b/mingw-w64-headers/crt/ctype.h
@@ -25,7 +25,7 @@ #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -37,7 +37,7 @@ #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype); @@ -199,7 +199,7 @@ extern int __mb_cur_max; #define __mb_cur_max __mb_cur_max #else -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); #endif #define __mb_cur_max (___mb_cur_max_func()) @@ -209,7 +209,7 @@ #endif #define __chvalidchk(a,b) (__PCTYPE_FUNC[(unsigned char)(a)] & (b)) -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _chvalidchk_l(_Char,_Flag,_Locale) (!_Locale ? __chvalidchk(_Char,_Flag) : ((_locale_t)_Locale)->locinfo->_locale_pctype[(unsigned char)(_Char)] & (_Flag)) #define _ischartype_l(_Char,_Flag,_Locale) (((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->_locale_mb_cur_max) > 1) ? _isctype_l(_Char,(_Flag),_Locale) : _chvalidchk_l(_Char,_Flag,_Locale)) #else
diff --git a/mingw-w64-headers/crt/inttypes.h b/mingw-w64-headers/crt/inttypes.h index 23dcd42..0a3abb8 100644 --- a/mingw-w64-headers/crt/inttypes.h +++ b/mingw-w64-headers/crt/inttypes.h
@@ -29,7 +29,7 @@ * The non-standard I64 length specifier causes warning in GCC, * but understood by MS runtime functions. */ -#if __MSVCRT_VERSION__ >= 0x1400 || __USE_MINGW_ANSI_STDIO +#if defined(_UCRT) || __USE_MINGW_ANSI_STDIO #define PRId64 "lld" #define PRIi64 "lli" #define PRIo64 "llo"
diff --git a/mingw-w64-headers/crt/sec_api/stdio_s.h b/mingw-w64-headers/crt/sec_api/stdio_s.h index 483d786..2dbc3fb 100644 --- a/mingw-w64-headers/crt/sec_api/stdio_s.h +++ b/mingw-w64-headers/crt/sec_api/stdio_s.h
@@ -27,7 +27,7 @@ size_t __cdecl fread_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vsprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsprintf_p(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, size_t _MaxCount, const char *_Format, _locale_t _Locale, va_list _ArgList); @@ -465,7 +465,7 @@ __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fprintf_s(FILE *_File,const char *_Format,...); _CRTIMP int __cdecl _fscanf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...); int __cdecl printf_s(const char *_Format,...); @@ -530,7 +530,7 @@ _CRTIMP int __cdecl _snprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _vsnprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList); _CRTIMP int __cdecl _vsnprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *,_locale_t _Locale,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList) @@ -553,7 +553,7 @@ _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(wchar_t*,_getws_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, size_t _MaxCount, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_s(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -733,7 +733,7 @@ __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); int __cdecl wprintf_s(const wchar_t *_Format,...); int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -762,7 +762,7 @@ _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vswprintf_s, wchar_t, _Dst, const wchar_t*, _Format, va_list, _ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,swprintf_s,vswprintf_s,wchar_t,_Dst,const wchar_t*,_Format) @@ -775,7 +775,7 @@ _CRTIMP errno_t __cdecl _wtmpnam_s(wchar_t *_DstBuf,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t,_wtmpnam_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -808,7 +808,7 @@ _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #endif /* _WSTDIO_S_DEFINED */ #endif /* _STDIO_S_DEFINED */
diff --git a/mingw-w64-headers/crt/sec_api/wchar_s.h b/mingw-w64-headers/crt/sec_api/wchar_s.h index d6329d5..3afd83e 100644 --- a/mingw-w64-headers/crt/sec_api/wchar_s.h +++ b/mingw-w64-headers/crt/sec_api/wchar_s.h
@@ -43,7 +43,7 @@ _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(wchar_t*,_getws_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, size_t _MaxCount, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_s(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -223,7 +223,7 @@ __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); int __cdecl wprintf_s(const wchar_t *_Format,...); int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -252,7 +252,7 @@ _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vswprintf_s, wchar_t, _Dst, const wchar_t*, _Format, va_list, _ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,swprintf_s,vswprintf_s,wchar_t,_Dst,const wchar_t*,_Format)
diff --git a/mingw-w64-headers/crt/setjmp.h b/mingw-w64-headers/crt/setjmp.h index 9f46164..f66ea71 100644 --- a/mingw-w64-headers/crt/setjmp.h +++ b/mingw-w64-headers/crt/setjmp.h
@@ -205,7 +205,7 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void); #if !defined(USE_NO_MINGW_SETJMP_TWO_ARGS) -# if __MSVCRT_VERSION__ >= 0x1400 +# ifdef _UCRT # ifdef _WIN64 # define _setjmp __intrinsic_setjmpex # else
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h index 9c3d188..e183236 100644 --- a/mingw-w64-headers/crt/stdio.h +++ b/mingw-w64-headers/crt/stdio.h
@@ -134,7 +134,7 @@ #define _TWO_DIGIT_EXPONENT 0x1 -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -208,7 +208,7 @@ __attribute__((__format__ (gnu_printf, 2, 0))) __attribute__((nonnull (1,2))) int __cdecl __mingw_vasprintf(char ** __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfprintf(unsigned __int64 options, FILE *file, const char *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vsscanf(unsigned __int64 options, const char *input, size_t length, const char *format, _locale_t locale, va_list valist); @@ -221,7 +221,7 @@ #if defined(__clang__) #define __MINGW_PRINTF_FORMAT printf #define __MINGW_SCANF_FORMAT scanf -#elif __MSVCRT_VERSION__ >= 0x1400 || __USE_MINGW_ANSI_STDIO +#elif defined(_UCRT) || __USE_MINGW_ANSI_STDIO #define __MINGW_PRINTF_FORMAT gnu_printf #define __MINGW_SCANF_FORMAT gnu_scanf #else @@ -417,7 +417,7 @@ /* * Default configuration: simply direct all calls to MSVCRT... */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" @@ -563,7 +563,7 @@ #endif #endif /* __NO_ISOCEXT */ -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ _CRTIMP int __cdecl _filbuf(FILE *_File); @@ -611,7 +611,7 @@ /* int fseeko32(FILE* stream, _off_t offset, int whence);*/ /* fseeko32 redirects to fseeko64 */ _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_static_ovr int fseeko(FILE *_File, _off_t _Offset, int _Origin) { return fseek(_File, _Offset, _Origin); } @@ -682,7 +682,7 @@ _CRTIMP unsigned int __cdecl _set_output_format(unsigned int _Format); _CRTIMP unsigned int __cdecl _get_output_format(void); int __cdecl setvbuf(FILE * __restrict__ _File,char * __restrict__ _Buf,int _Mode,size_t _Size); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scprintf(const char * __restrict__ _Format,...) { @@ -711,7 +711,7 @@ char *__cdecl tmpnam(char *_Buffer); int __cdecl ungetc(int _Ch,FILE *_File); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __attribute__((__format__ (__MINGW_PRINTF_FORMAT, 3, 0))) __MINGW_ATTRIB_NONNULL(3) int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; __mingw_ovr @@ -734,7 +734,7 @@ #if __USE_MINGW_ANSI_STDIO == 0 -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" @@ -793,10 +793,10 @@ #ifdef __GNUC__ #pragma GCC diagnostic pop #endif -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList) { @@ -804,7 +804,7 @@ } #else _CRTIMP int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ _CRTIMP int __cdecl _set_printf_count_output(int _Value); _CRTIMP int __cdecl _get_printf_count_output(void); @@ -842,7 +842,7 @@ /* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vswscanf(unsigned __int64 options, const wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, va_list valist); @@ -970,7 +970,7 @@ #else /* !__USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN { @@ -1087,7 +1087,7 @@ int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ #ifndef WEOF @@ -1114,7 +1114,7 @@ _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) { @@ -1216,7 +1216,7 @@ #endif /* ! __NO_ISOCEXT */ _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #ifndef RC_INVOKED #include <swprintf.inl> @@ -1269,7 +1269,7 @@ #define _STDIO_DEFINED #endif -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP int __cdecl _fgetc_nolock(FILE *_File); _CRTIMP int __cdecl _fputc_nolock(int _Char, FILE *_File); _CRTIMP int __cdecl _getc_nolock(FILE *_File);
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h index a8cc106..deceef8 100644 --- a/mingw-w64-headers/crt/stdlib.h +++ b/mingw-w64-headers/crt/stdlib.h
@@ -112,7 +112,7 @@ extern int __mb_cur_max; #define __mb_cur_max __mb_cur_max #else -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); #endif #define __mb_cur_max (___mb_cur_max_func()) @@ -164,7 +164,7 @@ extern char *_sys_errlist[]; extern int _sys_nerr; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP char **__cdecl __sys_errlist(void); _CRTIMP int *__cdecl __sys_nerr(void); #define _sys_nerr (*__sys_nerr()) @@ -172,14 +172,14 @@ #else extern __declspec(dllimport) char *_sys_errlist[1]; extern __declspec(dllimport) int _sys_nerr; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #endif /* We have a fallback definition of __p___argv and __p__fmode for msvcrt versions that lack it. */ _CRTIMP char ***__cdecl __p___argv(void); _CRTIMP int *__cdecl __p__fmode(void); -#if (defined(_X86_) && !defined(__x86_64)) || (__MSVCRT_VERSION__ >= 0x1400) +#if (defined(_X86_) && !defined(__x86_64)) || defined(_UCRT) _CRTIMP int *__cdecl __p___argc(void); _CRTIMP wchar_t ***__cdecl __p___wargv(void); _CRTIMP char ***__cdecl __p__environ(void); @@ -246,7 +246,7 @@ extern unsigned int _winminor; #endif -#elif __MSVCRT_VERSION__ >= 0x1400 +#elif defined(_UCRT) #ifndef __argc #define __argc (* __p___argc()) @@ -276,7 +276,7 @@ #define _wpgmptr (* __p__wpgmptr()) #endif -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ #ifndef __argc extern int * __MINGW_IMP_SYMBOL(__argc); @@ -365,7 +365,7 @@ #define _winminor (* __MINGW_IMP_SYMBOL(_winminor)) #endif -#endif /* !_MSVCRT_ && __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_MSVCRT_ && !_UCRT */ errno_t __cdecl _get_osplatform(unsigned int *_Value); errno_t __cdecl _get_osver(unsigned int *_Value); @@ -499,7 +499,7 @@ extern double __cdecl __MINGW_NOTHROW __strtod (const char * __restrict__ , char ** __restrict__); // The ucrtbase version of strtod is C99 compliant, so we don't need to redirect it to the mingw version. -#if !defined(__USE_MINGW_STRTOX) && __MSVCRT_VERSION__ < 0x1400 +#if !defined(__USE_MINGW_STRTOX) && !defined(_UCRT) #define strtod __strtod #endif /* !defined(__USE_MINGW_STRTOX) */ #endif /* __NO_ISOCEXT */
diff --git a/mingw-w64-headers/crt/sys/stat.h b/mingw-w64-headers/crt/sys/stat.h index d91a498..3d4cf45 100644 --- a/mingw-w64-headers/crt/sys/stat.h +++ b/mingw-w64-headers/crt/sys/stat.h
@@ -172,7 +172,7 @@ #if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) int __cdecl fstat(int _Desc,struct stat *_Stat); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl stat(const char *_Filename,struct stat *_Stat) { return _stat(_Filename, (struct _stat *)_Stat);
diff --git a/mingw-w64-headers/crt/time.h b/mingw-w64-headers/crt/time.h index cd5a61d..481d3d3 100644 --- a/mingw-w64-headers/crt/time.h +++ b/mingw-w64-headers/crt/time.h
@@ -109,7 +109,7 @@ #define CLOCKS_PER_SEC 1000 -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP int *__cdecl __daylight(void); _CRTIMP long *__cdecl __dstbias(void); _CRTIMP long *__cdecl __timezone(void); @@ -153,7 +153,7 @@ void __cdecl tzset(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #endif #if !defined (_POSIX_) -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP #endif void __cdecl _tzset(void); @@ -244,7 +244,7 @@ #if !defined(NO_OLDNAMES) || defined(_POSIX) #define CLK_TCK CLOCKS_PER_SEC -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define __MINGW_ATTRIB_DEPRECATED_UCRT \ __MINGW_ATTRIB_DEPRECATED_MSG( \ "Only provided for source compatibility; this variable might " \
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h index 94a86a2..cd26e09 100644 --- a/mingw-w64-headers/crt/wchar.h +++ b/mingw-w64-headers/crt/wchar.h
@@ -168,7 +168,7 @@ #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -180,7 +180,7 @@ #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype); @@ -234,7 +234,7 @@ #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -497,7 +497,7 @@ /* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vswscanf(unsigned __int64 options, const wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, va_list valist); @@ -637,7 +637,7 @@ /* #endif */ /* __NO_ISOCEXT */ #else /* !__USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN { @@ -754,7 +754,7 @@ int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ @@ -782,7 +782,7 @@ _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) { @@ -863,12 +863,12 @@ #pragma pop_macro ("snwprintf") #endif -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* _WSTDIO_DEFINED */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_p(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_p(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -1141,7 +1141,7 @@ __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ _CRTIMP int __cdecl _fwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vfwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); @@ -1172,7 +1172,7 @@ _CRTIMP int __cdecl __swprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _vswprintf_l(wchar_t * __restrict__ _Dest,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl __vswprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #ifndef RC_INVOKED #include <swprintf.inl> @@ -1186,7 +1186,7 @@ #endif _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); _CRTIMP int __cdecl _vscwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); _CRTIMP int __cdecl _fwscanf_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -1194,7 +1194,7 @@ _CRTIMP int __cdecl _snwscanf(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _snwscanf_l(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); _CRTIMP FILE *__cdecl _wfopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP FILE *__cdecl _wfreopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode,FILE * __restrict__ _OldFile) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
diff --git a/mingw-w64-headers/crt/wctype.h b/mingw-w64-headers/crt/wctype.h index c89c5d2..8b1caa6 100644 --- a/mingw-w64-headers/crt/wctype.h +++ b/mingw-w64-headers/crt/wctype.h
@@ -48,7 +48,7 @@ #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -60,7 +60,7 @@ #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype);