Module: wine Branch: master Commit: ac4e67597301d2d2e73174df5397eb07b01bb3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4e67597301d2d2e73174df5...
Author: Piotr Caban piotr@codeweavers.com Date: Fri May 14 16:11:59 2021 +0200
msvcrt: Call nextafter in nexttoward implementation.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 8 +------- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/configure b/configure index 525d585130f..ae7f66fb034 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - nexttoward \ nexttowardf \ remainder \ remainderf \ diff --git a/configure.ac b/configure.ac index 2e8ff20aeef..626c7674686 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - nexttoward \ nexttowardf \ remainder \ remainderf \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 77018e27cf5..6e32021373a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3487,13 +3487,7 @@ float CDECL nearbyintf(float x) */ double CDECL MSVCRT_nexttoward(double num, double next) { - double ret = unix_funcs->nexttoward(num, next); - if (!(_fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN - | _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num)) - { - *_errno() = ERANGE; - } - return ret; + return _nextafter(num, next); }
/********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index c36d5a2caad..7c1cb0bd698 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,19 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); }
-/********************************************************************* - * nexttoward - */ -static double CDECL unix_nexttoward(double num, double next) -{ -#ifdef HAVE_NEXTTOWARD - return nexttoward(num, next); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * nexttowardf */ @@ -806,7 +793,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nexttoward, unix_nexttowardf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 1a8807b8495..f30f8d33fca 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - double (CDECL *nexttoward)(double x, double y); float (CDECL *nexttowardf)(float x, double y); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); diff --git a/include/config.h.in b/include/config.h.in index a638c0382c9..1f2ddbe520f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -567,9 +567,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H
-/* Define to 1 if you have the `nexttoward' function. */ -#undef HAVE_NEXTTOWARD - /* Define to 1 if you have the `nexttowardf' function. */ #undef HAVE_NEXTTOWARDF