UCRT is handled in a separate ifdef further above. Signed-off-by: Martin Storsjö <mar...@martin.st> --- mingw-w64-headers/crt/stdlib.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h index 45f03807a..a8cc106df 100644 --- a/mingw-w64-headers/crt/stdlib.h +++ b/mingw-w64-headers/crt/stdlib.h @@ -292,8 +292,9 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #endif #ifndef _POSIX_ -#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) && (__MSVCRT_VERSION__ == 0x700) - /* The plain msvcrt.dll for arm/aarch64 lacks _environ/_wenviron */ +#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) + /* The plain msvcrt.dll for arm/aarch64 (and msvcr120_app.dll for arm) lacks + * _environ/_wenviron, but has these functions instead. */ _CRTIMP void __cdecl _get_environ(char ***); _CRTIMP void __cdecl _get_wenviron(wchar_t ***); @@ -316,7 +317,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #ifndef _wenviron #define _wenviron (__get_wenviron_ptr()) #endif -#else /* ARM/ARM64 && __MSVCRT_VERSION__ == 0x700 */ +#else /* ARM/ARM64 */ #ifndef _environ extern char *** __MINGW_IMP_SYMBOL(_environ); #define _environ (* __MINGW_IMP_SYMBOL(_environ)) @@ -326,7 +327,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); extern wchar_t *** __MINGW_IMP_SYMBOL(_wenviron); #define _wenviron (* __MINGW_IMP_SYMBOL(_wenviron)) #endif -#endif /* !ARM/ARM64 || __MSVCRT_VERSION__ != 0x700 */ +#endif /* !ARM/ARM64 */ #endif /* !_POSIX_ */ #ifndef _pgmptr -- 2.17.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
