[Mingw-w64-public] [PATCH 1/3] headers: Declare __ms_vsscanf, __ms_vscanf, __ms_vfscanf, __ms_vswscanf, __ms_vwscanf, __ms_vfwscanf, __ms_snprintf, __ms_vsnprintf, __ms_snwprintf and __ms_vsnwprintf also for UCRT builds

Sat, 14 Dec 2024 10:55:00 -0800 

Declaration of all these functions is currently hidden inside !_UCRT
block. Move them outside of the block, so they are always visible.
---
 mingw-w64-headers/crt/stdio.h | 45 +++++++++++++++++++----------------
 mingw-w64-headers/crt/wchar.h | 16 ++++++++-----
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h
index 7e0d3d9175f0..df21a27b74e9 100644
--- a/mingw-w64-headers/crt/stdio.h
+++ b/mingw-w64-headers/crt/stdio.h
@@ -207,12 +207,21 @@ extern
 extern
   __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * 
__restrict__ _Format,...);
+extern
+  __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vsscanf(const char * __restrict__ _Str,const char * 
__restrict__ _Format,va_list argp);
 extern
   __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1)
   int __cdecl __ms_scanf(const char * __restrict__ _Format,...);
+extern
+  __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)
+  int __cdecl __ms_vscanf(const char * __restrict__ _Format,va_list argp);
 extern
   __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ 
_Format,...);
+extern
+  __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vfscanf(FILE * __restrict__ _File,const char * __restrict__ 
_Format,va_list argp);
 
 extern
   __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1)
@@ -232,6 +241,12 @@ extern
 extern
   __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , 
va_list) __MINGW_NOTHROW;
+extern
+  __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_snprintf (char * __restrict__ , size_t , const char * 
__restrict__ , ...) __MINGW_NOTHROW;
+extern
+  __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_vsnprintf (char * __restrict__ , size_t , const char * 
__restrict__ , va_list) __MINGW_NOTHROW;
 
 #ifdef _UCRT
   int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, 
size_t len, const char *format, _locale_t locale, va_list valist);
@@ -487,13 +502,6 @@ int vsnprintf (char *__stream, size_t __n, const char 
*__format, __builtin_va_li
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-  __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)
-  int __cdecl __ms_vscanf(const char * __restrict__ Format, va_list argp);
-  __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
-  int __cdecl __ms_vfscanf (FILE * __restrict__ fp, const char * __restrict__ 
Format,va_list argp);
-  __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
-  int __cdecl __ms_vsscanf (const char * __restrict__ _Str,const char * 
__restrict__ Format,va_list argp);
-
   __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
   int vfscanf (FILE *__stream,  const char *__format, __builtin_va_list 
__local_argv)
   __MINGW_ASM_CALL(__ms_vfscanf);
@@ -794,10 +802,6 @@ char * tmpnam(char * __dst)
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-  __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
-  int __cdecl __ms_vsnprintf(char * __restrict__ d,size_t n,const char * 
__restrict__ format,va_list arg)
-    __MINGW_ATTRIB_DEPRECATED_MSVC2005 __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
-
   __mingw_bos_ovr
   __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
   int vsnprintf (char * __restrict__ __stream, size_t __n, const char * 
__restrict__ __format, va_list __local_argv)
@@ -810,9 +814,6 @@ char * tmpnam(char * __dst)
     return __ms_vsnprintf (__stream, __n, __format, __local_argv);
   }
 
-  __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3)
-  int __cdecl __ms_snprintf(char * __restrict__ s, size_t n, const char * 
__restrict__  format, ...);
-
 #ifndef __NO_ISOCEXT
 #if __MINGW_FORTIFY_VA_ARG
 
@@ -929,10 +930,16 @@ int vsprintf (char * __restrict__ __stream, const char * 
__restrict__ __format,
 
 /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,va_list);
 /* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
   int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
+  int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list);
 /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,va_list);
 
 /* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,...);
@@ -946,6 +953,10 @@ int vsprintf (char * __restrict__ __stream, const char * 
__restrict__ __format,
   int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , ...);
 /* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
   int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ ,va_list);
+/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , ...);
+/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , va_list);
 
 #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);
@@ -1139,10 +1150,6 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const 
wchar_t *__format, __builti
   int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) 
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-  int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list);
-  int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ 
,va_list);
-  int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * 
__restrict__ ,va_list);
-
   __MINGW_ATTRIB_NONNULL(2)
   int vfwscanf (FILE *__stream,  const wchar_t *__format, __builtin_va_list 
__local_argv)
   __MINGW_ASM_CALL(__ms_vfwscanf);
@@ -1291,8 +1298,6 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const 
wchar_t *__format, __builti
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 
 #if __USE_MINGW_ANSI_STDIO == 0
-  int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const 
wchar_t * __restrict__ format, ...);
-  int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t 
* __restrict__ , va_list);
   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
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index ca2c1fc70cb3..4ddffa84c79b 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -473,10 +473,16 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
 
 /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,va_list);
 /* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
   int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
+  int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list);
 /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,...);
+/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
+  int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,va_list);
 
 /* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
   int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * 
__restrict__ _Format,...);
@@ -490,6 +496,10 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
   int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , ...);
 /* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
   int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ ,va_list);
+/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , ...);
+/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
+  int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * 
__restrict__ , va_list);
 
 #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);
@@ -685,10 +695,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
   int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * 
__restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) 
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-  int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list);
-  int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ 
,va_list);
-  int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * 
__restrict__ ,va_list);
-
   __mingw_ovr
   __MINGW_ATTRIB_NONNULL(2)
   int vfwscanf (FILE *__stream,  const wchar_t *__format, __builtin_va_list 
__local_argv)
@@ -798,8 +804,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
 #pragma push_macro("vsnwprintf")
 # undef snwprintf
 # undef vsnwprintf
-  int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const 
wchar_t * __restrict__ format, ...);
-  int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t 
* __restrict__ , va_list);
   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);
 #pragma pop_macro ("vsnwprintf")
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to