Skip to content

Commit e9c8e7e

Browse files
author
Git for Windows Build Agent
committed
Update 12 packages
mingw-w64-i686-crt-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-i686-headers-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-i686-libmangle-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-i686-libwinpthread-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-i686-tools-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-i686-winpthreads-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-crt-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-headers-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-libmangle-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-libwinpthread-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-tools-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) mingw-w64-x86_64-winpthreads-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent b16106d commit e9c8e7e

File tree

145 files changed

+559
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+559
-279
lines changed

‎mingw32/bin/gendef.exe‎

0 Bytes
Binary file not shown.

‎mingw32/bin/genidl.exe‎

0 Bytes
Binary file not shown.

‎mingw32/bin/genpeimg.exe‎

0 Bytes
Binary file not shown.

‎mingw32/bin/libwinpthread-1.dll‎

0 Bytes
Binary file not shown.

‎mingw32/bin/widl.exe‎

0 Bytes
Binary file not shown.

‎mingw32/include/stdio.h‎

Lines changed: 80 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -915,10 +915,10 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,
915915
int __cdecl __mingw_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
916916
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
917917
int __cdecl __mingw_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
918-
/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
919-
int __cdecl __mingw_swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...);
920-
/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
921-
int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list);
918+
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
919+
int __cdecl __mingw_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);
920+
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
921+
int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);
922922

923923
/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
924924
int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);
@@ -935,10 +935,10 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,
935935
int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);
936936
/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
937937
int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);
938-
/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
939-
int __cdecl __ms_swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...);
940-
/* __attribute__((__format__ (ms_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
941-
int __cdecl __ms_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list);
938+
/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
939+
int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);
940+
/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
941+
int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);
942942

943943
#ifdef _UCRT
944944
int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);
@@ -996,6 +996,32 @@ __MINGW_ASM_CALL(__mingw_vfwprintf);
996996
int vwprintf (const wchar_t *__format, __builtin_va_list __local_argv)
997997
__MINGW_ASM_CALL(__mingw_vwprintf);
998998

999+
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
1000+
int swprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...)
1001+
__MINGW_ASM_CALL(__mingw_swprintf);
1002+
1003+
#if __MINGW_FORTIFY_VA_ARG
1004+
1005+
__mingw_bos_extern_ovr
1006+
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
1007+
int swprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...)
1008+
{
1009+
__mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1);
1010+
return __mingw_swprintf( __stream, __n, __format, __builtin_va_arg_pack() );
1011+
}
1012+
1013+
#endif /* __MINGW_FORTIFY_VA_ARG */
1014+
1015+
__mingw_bos_ovr
1016+
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
1017+
int vswprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builtin_va_list __local_argv)
1018+
{
1019+
#if __MINGW_FORTIFY_LEVEL > 0
1020+
__mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1);
1021+
#endif
1022+
return __mingw_vswprintf( __stream, __n, __format, __local_argv );
1023+
}
1024+
9991025
#ifndef __NO_ISOCEXT /* externs in libmingwex.a */
10001026

10011027
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
@@ -1023,6 +1049,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
10231049
#endif
10241050
return __mingw_vsnwprintf( __stream, __n, __format, __local_argv );
10251051
}
1052+
10261053
#endif /* __NO_ISOCEXT */
10271054

10281055
#else /* !__USE_MINGW_ANSI_STDIO */
@@ -1170,7 +1197,45 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
11701197

11711198
#if __USE_MINGW_ANSI_STDIO == 0
11721199
__mingw_ovr
1173-
int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
1200+
int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...)
1201+
{
1202+
__builtin_va_list __ap;
1203+
int __ret;
1204+
/*
1205+
* __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
1206+
* without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
1207+
* executed in "standard snprintf behavior" and returns number of (wide)
1208+
* chars required to allocate. For all other cases it is executed in a way
1209+
* that returns negative value on error. But C95+ compliant swprintf() for
1210+
* case _Count == 0 returns negative value, so handle this case specially.
1211+
*/
1212+
if (_Dest == NULL && _Count == 0)
1213+
return -1;
1214+
__builtin_va_start(__ap, _Format);
1215+
__ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap);
1216+
__builtin_va_end(__ap);
1217+
return __ret < 0 ? -1 : __ret;
1218+
}
1219+
__mingw_ovr
1220+
int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args)
1221+
{
1222+
int __ret;
1223+
/*
1224+
* __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
1225+
* without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
1226+
* executed in "standard snprintf behavior" and returns number of (wide)
1227+
* chars required to allocate. For all other cases it is executed in a way
1228+
* that returns negative value on error. But C95+ compliant vswprintf() for
1229+
* case _Count == 0 returns negative value, so handle this case specially.
1230+
*/
1231+
if (_Dest == NULL && _Count == 0)
1232+
return -1;
1233+
__ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args);
1234+
return __ret < 0 ? -1 : __ret;
1235+
}
1236+
1237+
__mingw_ovr
1238+
int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
11741239
{
11751240
__builtin_va_list __ap;
11761241
int __ret;
@@ -1182,8 +1247,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
11821247
__mingw_ovr
11831248
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
11841249
{
1185-
int __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, s, n, format, NULL, arg);
1186-
return __ret < 0 ? -1 : __ret;
1250+
return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg);
11871251
}
11881252
#endif
11891253

@@ -1222,26 +1286,16 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
12221286
#if __USE_MINGW_ANSI_STDIO == 0
12231287
int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
12241288
int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
1225-
__mingw_ovr
1226-
int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
1227-
{
1228-
int r;
1229-
va_list argp;
1230-
__builtin_va_start (argp, format);
1231-
r = _vsnwprintf (s, n, format, argp);
1232-
__builtin_va_end (argp);
1233-
return r;
1234-
}
1235-
__mingw_ovr
1236-
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
1237-
{
1238-
return _vsnwprintf(s,n,format,arg);
1239-
}
1289+
int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
1290+
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
12401291
#endif
12411292

12421293
#endif /* ! __NO_ISOCEXT */
12431294
_CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...);
12441295
_CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args);
1296+
1297+
int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...);
1298+
int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args);
12451299
#endif /* _UCRT */
12461300

12471301
#ifndef RC_INVOKED

‎mingw32/include/string.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,13 @@ extern "C" {
144144
_CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch);
145145
size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control);
146146
_CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr);
147-
#if defined(_UCRT)
148-
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t **_Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
149-
#else
150-
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
147+
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
148+
wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
149+
#if defined(_CRT_NON_CONFORMING_WCSTOK) && !defined(__cplusplus)
150+
#define wcstok _wcstok
151+
#endif
152+
#if !defined(_CRT_NO_INLINE_DEPRECATED_WCSTOK) && defined(__cplusplus)
153+
extern "C++" inline wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) { return _wcstok(_Str, _Delim); }
151154
#endif
152155
_CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
153156
_CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;

‎mingw32/include/swprintf.inl‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,6 @@
99

1010
#include <vadefs.h>
1111

12-
__mingw_ovr
13-
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
14-
int vswprintf (wchar_t *__stream, size_t __count, const wchar_t *__format, __builtin_va_list __local_argv)
15-
{
16-
return vsnwprintf( __stream, __count, __format, __local_argv );
17-
}
18-
19-
__mingw_ovr
20-
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
21-
int swprintf (wchar_t *__stream, size_t __count, const wchar_t *__format, ...)
22-
{
23-
int __retval;
24-
__builtin_va_list __local_argv;
25-
26-
__builtin_va_start( __local_argv, __format );
27-
__retval = vswprintf( __stream, __count, __format, __local_argv );
28-
__builtin_va_end( __local_argv );
29-
return __retval;
30-
}
31-
3212
#ifdef __cplusplus
3313

3414
extern "C++" {
@@ -37,37 +17,33 @@ __mingw_ovr
3717
/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
3818
int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv)
3919
{
40-
#if __USE_MINGW_ANSI_STDIO
41-
return __mingw_vswprintf( __stream, __format, __local_argv );
42-
#else
4320
return _vswprintf( __stream, __format, __local_argv );
44-
#endif
4521
}
4622

4723
__mingw_ovr
4824
/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
4925
int swprintf (wchar_t *__stream, const wchar_t *__format, ...)
5026
{
27+
#ifdef __clang__
28+
/* clang does not support __builtin_va_arg_pack(), so forward swprintf() to vswprintf() */
5129
int __retval;
5230
__builtin_va_list __local_argv;
5331

5432
__builtin_va_start( __local_argv, __format );
5533
__retval = vswprintf( __stream, __format, __local_argv );
5634
__builtin_va_end( __local_argv );
5735
return __retval;
36+
#else
37+
return _swprintf( __stream, __format, __builtin_va_arg_pack() );
38+
#endif
5839
}
5940

6041
}
6142

6243
#elif defined(_CRT_NON_CONFORMING_SWPRINTFS)
6344

64-
#if __USE_MINGW_ANSI_STDIO
65-
#define swprintf __mingw_swprintf
66-
#define vswprintf __mingw_vswprintf
67-
#else
6845
#define swprintf _swprintf
6946
#define vswprintf _vswprintf
70-
#endif
7147

7248
#endif /* __cplusplus */
7349

‎mingw32/include/tchar.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extern "C" {
133133
#define _tenviron _wenviron
134134
#define __targv __wargv
135135

136-
#define _tprintf wprintf
136+
#define _tprintf __ms_wprintf
137137
#define _tprintf_l _wprintf_l
138138
#define _tprintf_p _wprintf_p
139139
#define _tprintf_p_l _wprintf_p_l
@@ -145,11 +145,11 @@ extern "C" {
145145
#define _vtcprintf_l _vcwprintf_l
146146
#define _vtcprintf_p _vcwprintf_p
147147
#define _vtcprintf_p_l _vcwprintf_p_l
148-
#define _ftprintf fwprintf
148+
#define _ftprintf __ms_fwprintf
149149
#define _ftprintf_l _fwprintf_l
150150
#define _ftprintf_p _fwprintf_p
151151
#define _ftprintf_p_l _fwprintf_p_l
152-
#define _stprintf swprintf
152+
#define _stprintf _swprintf
153153
#define _stprintf_l __swprintf_l
154154
#define _stprintf_p _swprintf_p
155155
#define _stprintf_p_l _swprintf_p_l
@@ -159,15 +159,15 @@ extern "C" {
159159
#define _sctprintf_p_l _scwprintf_p_l
160160
#define _sntprintf _snwprintf
161161
#define _sntprintf_l _snwprintf_l
162-
#define _vtprintf vwprintf
162+
#define _vtprintf __ms_vwprintf
163163
#define _vtprintf_l _vwprintf_l
164164
#define _vtprintf_p _vwprintf_p
165165
#define _vtprintf_p_l _vwprintf_p_l
166-
#define _vftprintf vfwprintf
166+
#define _vftprintf __ms_vfwprintf
167167
#define _vftprintf_l _vfwprintf_l
168168
#define _vftprintf_p _vfwprintf_p
169169
#define _vftprintf_p_l _vfwprintf_p_l
170-
#define _vstprintf vswprintf
170+
#define _vstprintf _vswprintf
171171
#define _vstprintf_l _vswprintf_l
172172
#define _vstprintf_p _vswprintf_p
173173
#define _vstprintf_p_l _vswprintf_p_l
@@ -178,13 +178,13 @@ extern "C" {
178178
#define _vsntprintf _vsnwprintf
179179
#define _vsntprintf_l _vsnwprintf_l
180180

181-
#define _tscanf wscanf
181+
#define _tscanf __ms_wscanf
182182
#define _tscanf_l _wscanf_l
183183
#define _tcscanf _cwscanf
184184
#define _tcscanf_l _cwscanf_l
185-
#define _ftscanf fwscanf
185+
#define _ftscanf __ms_fwscanf
186186
#define _ftscanf_l _fwscanf_l
187-
#define _stscanf swscanf
187+
#define _stscanf __ms_swscanf
188188
#define _stscanf_l _swscanf_l
189189
#define _sntscanf _snwscanf
190190
#define _sntscanf_l _snwscanf_l
@@ -268,7 +268,7 @@ extern "C" {
268268
#define _tcsrchr wcsrchr
269269
#define _tcsspn wcsspn
270270
#define _tcsstr wcsstr
271-
#define _tcstok wcstok
271+
#define _tcstok _wcstok
272272
#define _tcstok_l _wcstok_l
273273
#define _tcserror _wcserror
274274
#define __tcserror __wcserror
@@ -477,7 +477,7 @@ extern "C" {
477477
#define _wcsspnp(_cpc1,_cpc2) (!_cpc1 ? NULL : ((*((_cpc1)+wcsspn(_cpc1,_cpc2))) ? ((_cpc1)+wcsspn(_cpc1,_cpc2)) : NULL))
478478
#define _wcsncpy_l(_Destination,_Source,_Count,_Locale) (wcsncpy(_Destination,_Source,_Count))
479479
#define _wcsncat_l(_Destination,_Source,_Count,_Locale) (wcsncat(_Destination,_Source,_Count))
480-
#define _wcstok_l(_String,_Delimiters,_Locale) (wcstok(_String,_Delimiters))
480+
#define _wcstok_l(_String,_Delimiters,_Locale) (_wcstok(_String,_Delimiters))
481481
#define _wcsnset_l(_Destination,_Value,_Count,_Locale) (_wcsnset(_Destination,_Value,_Count))
482482
#define _wcsset_l(_Destination,_Value,_Locale) (_wcsset(_Destination,_Value))
483483

@@ -520,7 +520,7 @@ extern "C" {
520520
#endif
521521
#define __targv __argv
522522

523-
#define _tprintf printf
523+
#define _tprintf __ms_printf
524524
#define _tprintf_l _printf_l
525525
#define _tprintf_p _printf_p
526526
#define _tprintf_p_l _printf_p_l
@@ -532,11 +532,11 @@ extern "C" {
532532
#define _vtcprintf_l _vcprintf_l
533533
#define _vtcprintf_p _vcprintf_p
534534
#define _vtcprintf_p_l _vcprintf_p_l
535-
#define _ftprintf fprintf
535+
#define _ftprintf __ms_fprintf
536536
#define _ftprintf_l _fprintf_l
537537
#define _ftprintf_p _fprintf_p
538538
#define _ftprintf_p_l _fprintf_p_l
539-
#define _stprintf sprintf
539+
#define _stprintf __ms_sprintf
540540
#define _stprintf_l _sprintf_l
541541
#define _stprintf_p _sprintf_p
542542
#define _stprintf_p_l _sprintf_p_l
@@ -546,15 +546,15 @@ extern "C" {
546546
#define _sctprintf_p_l _scprintf_p_l
547547
#define _sntprintf _snprintf
548548
#define _sntprintf_l _snprintf_l
549-
#define _vtprintf vprintf
549+
#define _vtprintf __ms_vprintf
550550
#define _vtprintf_l _vprintf_l
551551
#define _vtprintf_p _vprintf_p
552552
#define _vtprintf_p_l _vprintf_p_l
553-
#define _vftprintf vfprintf
553+
#define _vftprintf __ms_vfprintf
554554
#define _vftprintf_l _vfprintf_l
555555
#define _vftprintf_p _vfprintf_p
556556
#define _vftprintf_p_l _vfprintf_p_l
557-
#define _vstprintf vsprintf
557+
#define _vstprintf __ms_vsprintf
558558
#define _vstprintf_l _vsprintf_l
559559
#define _vstprintf_p _vsprintf_p
560560
#define _vstprintf_p_l _vsprintf_p_l
@@ -565,13 +565,13 @@ extern "C" {
565565
#define _vsntprintf _vsnprintf
566566
#define _vsntprintf_l _vsnprintf_l
567567

568-
#define _tscanf scanf
568+
#define _tscanf __ms_scanf
569569
#define _tscanf_l _scanf_l
570570
#define _tcscanf _cscanf
571571
#define _tcscanf_l _cscanf_l
572-
#define _ftscanf fscanf
572+
#define _ftscanf __ms_fscanf
573573
#define _ftscanf_l _fscanf_l
574-
#define _stscanf sscanf
574+
#define _stscanf __ms_sscanf
575575
#define _stscanf_l _sscanf_l
576576
#define _sntscanf _snscanf
577577
#define _sntscanf_l _snscanf_l

0 commit comments

Comments
 (0)