All these functions have same ABI and symbol name in all import libraries.
So deduplicate function declarations in stdio.h and wchar.h header files to
have just one declaration not depending on the _UCRT macro.
---
mingw-w64-headers/crt/stdio.h | 38 +++++++----------------------------
mingw-w64-headers/crt/wchar.h | 24 ++++++++--------------
2 files changed, 15 insertions(+), 47 deletions(-)
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h
index 52a5441eefc7..554a2b913fcd 100644
--- a/mingw-w64-headers/crt/stdio.h
+++ b/mingw-w64-headers/crt/stdio.h
@@ -1131,6 +1131,8 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const
wchar_t *__format, __builti
__MINGW_ATTRIB_NONNULL(1)
int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv);
+ int __cdecl snwprintf(wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...);
+ int __cdecl vsnwprintf(wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg);
#endif /* __NO_ISOCEXT */
int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__
_Format,...);
@@ -1138,6 +1140,9 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const
wchar_t *__format, __builti
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 /* _UCRT */
+
+ int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,...);
+ int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,va_list _Args);
#endif /* __USE_MINGW_ANSI_STDIO */
#ifndef WEOF
@@ -1164,46 +1169,17 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const
wchar_t *__format, __builti
_CRTIMP wchar_t *__cdecl _getws(wchar_t *_String)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _putws(const wchar_t *_Str);
-#ifdef _UCRT
- _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...);
- int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
- int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,va_list _Args)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
-
-#if __USE_MINGW_ANSI_STDIO == 0
- int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,...);
- int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,va_list _Args);
-
- int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...);
- int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg);
-#endif
-
- _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);
-
- _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list
_ArgList);
-#else
_CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...);
+#ifndef _UCRT
_CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t
_SizeInWords,const wchar_t * __restrict__ _Format,...);
_CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t
_SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList);
+#endif /* _UCRT */
_CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t
_Count,const wchar_t * __restrict__ _Format,...)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t
_Count,const wchar_t * __restrict__ _Format,va_list _Args)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list
_ArgList);
-
-#ifndef __NO_ISOCEXT /* externs in libmingwex.a */
-
-#if __USE_MINGW_ANSI_STDIO == 0
- int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
- int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
-#endif
-
-#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);
- int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,...);
- int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,va_list _Args);
-#endif /* _UCRT */
-
#ifndef RC_INVOKED
#include <swprintf.inl>
#endif
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index 4d46066ad911..89b1b1a4616d 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -534,21 +534,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
_CRTIMP wchar_t *__cdecl _getws(wchar_t *_String)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _putws(const wchar_t *_Str);
-#ifdef _UCRT
_CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...);
- int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const
wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
- _CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t
_Count,const wchar_t * __restrict__ _Format,va_list _Args)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
-
-#if __USE_MINGW_ANSI_STDIO == 0
- int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...);
- int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg);
-#endif
-#else
- _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...);
+#ifndef _UCRT
_CRTIMP int __cdecl _swprintf_l(wchar_t * __restrict__ ,size_t
_SizeInWords,const wchar_t * __restrict__ _Format,_locale_t _Locale,... )
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t
_SizeInWords,const wchar_t * __restrict__ _Format,...);
_CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t
_SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList);
+#endif
+
_CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t
_Count,const wchar_t * __restrict__ _Format,...)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t
_Count,const wchar_t * __restrict__ _Format,va_list _Args)
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
@@ -559,15 +552,13 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
#pragma push_macro("vsnwprintf")
# undef snwprintf
# undef vsnwprintf
- int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
- int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
+ int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, ...);
+ int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t *
__restrict__ format, va_list arg);
#pragma pop_macro ("vsnwprintf")
#pragma pop_macro ("snwprintf")
#endif
-#endif /* _UCRT */
-
-#endif /* _WSTDIO_DEFINED */
+#endif /* __NO_ISOCEXT */
#ifdef _UCRT
@@ -932,7 +923,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
#define _putwc_nolock(_c,_stm) _fputwc_nolock(_c,_stm)
#define _getwc_nolock(_c) _fgetwc_nolock(_c)
#endif
-#endif
+
+#endif /* _WSTDIO_DEFINED */
#ifndef _WSTDLIB_DEFINED
#define _WSTDLIB_DEFINED
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
