[PATCH 0/2] MR5897: include: Add a couple of CRT declarations.
From: Rémi Bernon <rbernon(a)codeweavers.com> --- include/msvcrt/math.h | 3 +++ include/msvcrt/stdlib.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index fc7de676c83..8238c5803b4 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -111,6 +111,9 @@ _ACRTIMP float __cdecl truncf(float); _ACRTIMP int __cdecl ilogb(double); _ACRTIMP int __cdecl ilogbf(float); +_ACRTIMP float __cdecl fmaf(float x, float y, float z); +_ACRTIMP double __cdecl fma(double x, double y, double z); + _ACRTIMP __int64 __cdecl llrint(double); _ACRTIMP __int64 __cdecl llrintf(float); _ACRTIMP __int64 __cdecl llround(double); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f1ffcd8c035..f3df662528a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -238,6 +238,8 @@ _ACRTIMP unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t) _ACRTIMP int __cdecl system(const char*); _ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); _ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void __cdecl qsort_s(void*,size_t,size_t,int (__cdecl *)(void*,const void*,const void*),void*); +_ACRTIMP unsigned int __cdecl _set_abort_behavior(unsigned int flags, unsigned int mask); typedef void (__cdecl *_purecall_handler)(void); _ACRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5897
From: Rémi Bernon <rbernon(a)codeweavers.com> --- include/msvcrt/math.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 8238c5803b4..03c4bf57f59 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -159,7 +159,6 @@ _ACRTIMP float __cdecl powf(float, float); _ACRTIMP float __cdecl sqrtf(float); _ACRTIMP float __cdecl ceilf(float); _ACRTIMP float __cdecl floorf(float); -_ACRTIMP float __cdecl frexpf(float, int*); _ACRTIMP float __cdecl modff(float, float*); _ACRTIMP float __cdecl fmodf(float, float); @@ -186,7 +185,6 @@ static inline float powf(float x, float y) { return pow(x, y); } static inline float sqrtf(float x) { return sqrt(x); } static inline float ceilf(float x) { return ceil(x); } static inline float floorf(float x) { return floor(x); } -static inline float frexpf(float x, int *y) { return frexp(x, y); } static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } static inline float fmodf(float x, float y) { return fmod(x, y); } @@ -209,6 +207,12 @@ static inline int _fpclassf(float x) #endif +#if (defined(__x86_64__) && !defined(_UCRT)) || defined(_NO_CRT_MATH_INLINE) +_ACRTIMP float __cdecl frexpf(float, int*); +#else +static inline float frexpf(float x, int *y) { return frexp(x, y); } +#endif + #if (!defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110)) || defined(_NO_CRT_MATH_INLINE) _ACRTIMP float __cdecl fabsf(float); #else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5897
participants (1)
-
Rémi Bernon