From: Rémi Bernon rbernon@codeweavers.com
--- include/msvcrt/stdlib.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 45ef5bfb1e7..380fc0655a2 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -231,6 +231,14 @@ _ACRTIMP void __cdecl srand(unsigned int); _ACRTIMP float __cdecl strtof(const char*,char**); _ACRTIMP float __cdecl _strtof_l(const char*,char**,_locale_t); _ACRTIMP double __cdecl strtod(const char*,char**); +_ACRTIMP double __cdecl _strtod_l(const char*,char**,_locale_t); +#if defined(__GNUC__) || _MSVCR_VER < 120 +static inline long double strtold(const char *string, char **endptr) { return strtod(string, endptr); } +static inline long double _strtold_l(const char *string, char **endptr, _locale_t locale) { return _strtod_l(string, endptr, locale); } +#else +_ACRTIMP long double __cdecl strtold(const char*,char**); +_ACRTIMP long double __cdecl _strtold_l(const char*,char**,_locale_t); +#endif _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); _ACRTIMP __int64 __cdecl _strtoll_l(const char*,char**,int,_locale_t); @@ -257,11 +265,6 @@ _ACRTIMP _invalid_parameter_handler __cdecl _set_thread_local_invalid_parameter_ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg);
-#ifdef _UCRT -_ACRTIMP double __cdecl _strtold_l(const char*,char**,_locale_t); -static inline long double strtold(const char *string, char **endptr) { return _strtold_l(string, endptr, NULL); } -#endif /* _UCRT */ - #ifdef __cplusplus extern "C++" {