msvcrt: Call nextafter in nexttoward implementation.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2021-05-14 16:11:59 +02:00 committed by Alexandre Julliard
parent 1dc3aa808f
commit ac4e675973
6 changed files with 1 additions and 27 deletions

1
configure vendored
View file

@ -19640,7 +19640,6 @@ for ac_func in \
log1pf \ log1pf \
log2 \ log2 \
log2f \ log2f \
nexttoward \
nexttowardf \ nexttowardf \
remainder \ remainder \
remainderf \ remainderf \

View file

@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\
log1pf \ log1pf \
log2 \ log2 \
log2f \ log2f \
nexttoward \
nexttowardf \ nexttowardf \
remainder \ remainder \
remainderf \ remainderf \

View file

@ -3487,13 +3487,7 @@ float CDECL nearbyintf(float x)
*/ */
double CDECL MSVCRT_nexttoward(double num, double next) double CDECL MSVCRT_nexttoward(double num, double next)
{ {
double ret = unix_funcs->nexttoward(num, next); return _nextafter(num, next);
if (!(_fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN
| _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num))
{
*_errno() = ERANGE;
}
return ret;
} }
/********************************************************************* /*********************************************************************

View file

@ -547,19 +547,6 @@ static float CDECL unix_modff( float x, float *iptr )
return modff( x, 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 * nexttowardf
*/ */
@ -806,7 +793,6 @@ static const struct unix_funcs funcs =
unix_logbf, unix_logbf,
unix_modf, unix_modf,
unix_modff, unix_modff,
unix_nexttoward,
unix_nexttowardf, unix_nexttowardf,
unix_pow, unix_pow,
unix_powf, unix_powf,

View file

@ -72,7 +72,6 @@ struct unix_funcs
float (CDECL *logbf)(float x); float (CDECL *logbf)(float x);
double (CDECL *modf)(double x, double *iptr); double (CDECL *modf)(double x, double *iptr);
float (CDECL *modff)(float x, float *iptr); float (CDECL *modff)(float x, float *iptr);
double (CDECL *nexttoward)(double x, double y);
float (CDECL *nexttowardf)(float x, double y); float (CDECL *nexttowardf)(float x, double y);
double (CDECL *pow)(double x, double y); double (CDECL *pow)(double x, double y);
float (CDECL *powf)(float x, float y); float (CDECL *powf)(float x, float y);

View file

@ -567,9 +567,6 @@
/* Define to 1 if you have the <net/route.h> header file. */ /* Define to 1 if you have the <net/route.h> header file. */
#undef HAVE_NET_ROUTE_H #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. */ /* Define to 1 if you have the `nexttowardf' function. */
#undef HAVE_NEXTTOWARDF #undef HAVE_NEXTTOWARDF