YongHao Hu : msvcr120: Enable MSVCRT__nextafterf when _MSVCR_VER>=120.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 29 15:49:00 CST 2015
Module: wine
Branch: master
Commit: 072f34be730761faa2fabefa8e4a3306d19c4a63
URL: http://source.winehq.org/git/wine.git/?a=commit;h=072f34be730761faa2fabefa8e4a3306d19c4a63
Author: YongHao Hu <christopherwuy at 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 at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 3bddaf7..6c0432d 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 5883d32..80091c5 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 270bcda..f8937b3 100644
--- 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__)
@@ -126,15 +135,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 6079bc4..3478342 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
More information about the wine-cvs
mailing list