On Wed, 7 May 2025, Pali Rohár wrote:
This was in builds with UCRT; builds with msvcrt seem to pass this stage -
see
https://github.com/mstorsjo/mingw-w64/actions/runs/14869105161/job/41753135722
for the full log. The same thing also show up in GCC builds with UCRT.
For patchsets like these, it'd be nice to test running with the CI before
posting for review if possible, so the reviewers don't need to do that.
I cannot access the build logs, seems to be private.
They're not private, but they do require you to be logged in to view them,
unfortunately.
But I see where is the issue. During rebasing of the commits I put
declaration of those functions into wrong #ifdef section. Change like
the following one could address the issue. I will do more testing and
then let you know.
fixup! headers: Deduplicate (v)swprintf, (v)snwprintf _(v)swprintf,
_(v)scwprintf functions across UCRT/msvcrt builds
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h
index 5beef25ea4de..f604975e77e0 100644
--- a/mingw-w64-headers/crt/stdio.h
+++ b/mingw-w64-headers/crt/stdio.h
@@ -1086,9 +1086,6 @@ 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,...);
@@ -1099,6 +1096,8 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const
wchar_t *__format, __builti
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 /* __USE_MINGW_ANSI_STDIO */
Pasting such diffs inline in a flowed text context does make it impossible
to apply the patch manually (the whitespace is munged; note the missing
leading whitespace on unchanged lines in the diff), but I think I've
managed to apply it by hand.
The build did pass now, and as this was the only remaining issue on this
patchset, I've pushed it.
// Martin
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
