Module: wine Branch: stable Commit: 673b47fe0a2dbf8d2b17e615540dace1b83f9eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=673b47fe0a2dbf8d2b17e61554...
Author: YongHao Hu christopherwuy@gmail.com Date: Mon Dec 28 20:48:23 2015 +0800
msvcr120: Enable MSVCRT__nextafterf when _MSVCR_VER>=120.
Signed-off-by: YongHao Hu christopherwuy@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 072f34be730761faa2fabefa8e4a3306d19c4a63) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
.../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 18 +++++++++--------- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 8d87fed..12c9ac8 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -293,9 +293,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) ucrtbase.nextafter +@ cdecl nextafterf(float float) ucrtbase.nextafterf +@ cdecl nextafterl(double double) ucrtbase.nextafterl @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b2eff02..e30ed25 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2299,9 +2299,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) MSVCRT__nextafter +@ cdecl nextafterf(float float) MSVCRT__nextafterf +@ cdecl nextafterl(double double) MSVCRT__nextafter @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8aeaec8..0e53344 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1962,9 +1962,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) msvcr120.nextafter +@ cdecl nextafterf(float float) msvcr120.nextafterf +@ cdecl nextafterl(double double) msvcr120.nextafterl @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 51bb99c..eed38d2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -105,6 +105,15 @@ float CDECL MSVCRT__copysignf( float num, float sign ) return signbit(num) ? -num : num; }
+/********************************************************************* + * _nextafterf (MSVCRT.@) + */ +float CDECL MSVCRT__nextafterf( float num, float next ) +{ + if (!finitef(num) || !finitef(next)) *MSVCRT__errno() = MSVCRT_EDOM; + return nextafterf( num, next ); +} + #endif #if defined(__x86_64__) || defined(__arm__)
@@ -137,15 +146,6 @@ float CDECL MSVCRT__logbf( float num ) }
/********************************************************************* - * _nextafterf (MSVCRT.@) - */ -float CDECL MSVCRT__nextafterf( float num, float next ) -{ - if (!finitef(num) || !finitef(next)) *MSVCRT__errno() = MSVCRT_EDOM; - return nextafterf( num, next ); -} - -/********************************************************************* * MSVCRT_acosf (MSVCRT.@) */ float CDECL MSVCRT_acosf( float x ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b5f752f..7ce36ff 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2434,9 +2434,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) MSVCRT__nextafter +@ cdecl nextafterf(float float) MSVCRT__nextafterf +@ cdecl nextafterl(double double) MSVCRT__nextafter @ stub nexttoward @ stub nexttowardf @ stub nexttowardl