在 2021-07-25 05:38, Jeremy Drake via Mingw-w64-public 写道:
Any thoughts on this? Maybe this needs to be moved further down the file? Or would that be too late for something else? I am concerned this might be an "ABI-breaking" situation for the experimental 'clang32' environment in MSYS2, so don't want to continue expanding the packages built there until it is figured out if we need to rebuild existing packages for this.
Please try the attached patch. -- Best regards, LIU Hao
From c3d22ae4026c98ee1f5e69055a7c1ec838034d3b Mon Sep 17 00:00:00 2001 From: LIU Hao <[email protected]> Date: Sun, 25 Jul 2021 11:29:59 +0800 Subject: [PATCH] headers: Move `_UCRT` into '_mingw.h' from 'corecrt.h' Signed-off-by: LIU Hao <[email protected]> --- mingw-w64-headers/crt/_mingw.h.in | 4 ++++ mingw-w64-headers/crt/corecrt.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in index b7fb99f4..83fa2da8 100644 --- a/mingw-w64-headers/crt/_mingw.h.in +++ b/mingw-w64-headers/crt/_mingw.h.in @@ -228,6 +228,10 @@ limitations in handling dllimport attribute. */ # endif #endif +#if !defined(_UCRT) && ((__MSVCRT_VERSION__ >= 0x1400) || (__MSVCRT_VERSION__ >= 0xE00 && __MSVCRT_VERSION__ < 0x1000)) +/* Allow both 0x1400 and 0xE00 to identify UCRT */ +#define _UCRT +#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT @DEFAULT_WIN32_WINNT@ diff --git a/mingw-w64-headers/crt/corecrt.h b/mingw-w64-headers/crt/corecrt.h index 80572c2e..abb72088 100644 --- a/mingw-w64-headers/crt/corecrt.h +++ b/mingw-w64-headers/crt/corecrt.h @@ -15,11 +15,6 @@ #pragma pack(push,_CRT_PACKING) #endif -#if !defined(_UCRT) && ((__MSVCRT_VERSION__ >= 0x1400) || (__MSVCRT_VERSION__ >= 0xE00 && __MSVCRT_VERSION__ < 0x1000)) -/* Allow both 0x1400 and 0xE00 to identify UCRT */ -#define _UCRT -#endif - #ifdef __ERRCODE_DEFINED_MS /* #define __ERRCODE_DEFINED_MS */ typedef int errcode; -- 2.32.0
OpenPGP_signature
Description: OpenPGP digital signature
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
