Emacs master build broken [MSYS2/UCRT64]

[Angelo Graziosi]

I have built master two day ago on MSYS2/UCRT64 using their patches 
(https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-emacs).

Now a recent change (Po Lu f2f2e6a082a541 ?) to src/sysdep.c has broken the 
build because the MSYS2 people patche does not apply:

patching file nt/cmdproxy.c
Hunk #1 succeeded at 38 (offset 3 lines).
patching file src/sysdep.c
Hunk #1 succeeded at 2985 (offset 292 lines).
Hunk #2 FAILED at 2704.
1 out of 2 hunks FAILED -- saving rejects to file src/sysdep.c.rej
Error: Failure patching nt/cmdproxy.c

where

$ cat emacs-master/src/sysdep.c.rej
--- src/sysdep.c.orig   2022-06-23 20:59:02.252891700 +0200
+++ src/sysdep.c        2022-06-23 21:05:31.998322600 +0200
@@ -2704,7 +2706,11 @@
   if (err | (ADDRESS_SANITIZER
             ? fflush (stderr) != 0 || ferror (stderr)
             : close_stream (stderr) != 0))
+#ifndef _UCRT // XXX: close_stream(stderr) fails for some reason
     _exit (EXIT_FAILURE);
+#else
+    ;
+#endif
 }


 #ifndef DOS_NT

Maybe you now how this should be fixed...

TIA