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>

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 8d87fed81ad83c0152807e975e60e03460abe320..12c9ac809906ea34d07987fb4f41c90256ecaab1 100644 (file)
--- 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 3bddaf7ba09205ad80afa77a1b46536a6cf7aa5f..6c0432d964212fc2ab3cced786173d198fde7c52 100644 (file)
--- 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 5883d326223e9ff2bca555340dd48badbb97d490..80091c56c454df57ec0f1ef1ab36dbf2bdb30cd0 100644 (file)
--- 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 270bcdabf890788945144bd2d997f30fd4da5539..f8937b3c72a0f2c5f96dd12ac17bfc04fcd55507 100644 (file)
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -94,6 +94,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__)
 
@@ -125,15 +134,6 @@ float CDECL MSVCRT__logbf( float num )
     return logbf(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.@)
  */

diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 6079bc4a914962b8dbf5bdf5adb99c2394a8b00b..34783422ce419c3dbf037ec86cfbbba4a55ad055 100644 (file)
--- 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