From: Karl Heuer Date: Fri, 4 Mar 1994 21:21:08 +0000 (+0000) Subject: (isnan): New macro. X-Git-Tag: emacs-19.34~9651 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a2f2d332e66b4549fcc88237e8eeb032b466657;p=emacs.git (isnan): New macro. (float_arith_driver): min and max yield NaN if any argument is a NaN. --- diff --git a/src/data.c b/src/data.c index 59e9e928d6e..adb8d38e3aa 100644 --- a/src/data.c +++ b/src/data.c @@ -1650,6 +1650,10 @@ arith_driver (code, nargs, args) } #ifdef LISP_FLOAT_TYPE + +#undef isnan +#define isnan(x) ((x) != (x)) + Lisp_Object float_arith_driver (accum, argnum, code, nargs, args) double accum; @@ -1707,11 +1711,11 @@ float_arith_driver (accum, argnum, code, nargs, args) case Alogxor: return wrong_type_argument (Qinteger_or_marker_p, val); case Amax: - if (!argnum || next > accum) + if (!argnum || isnan (next) || next > accum) accum = next; break; case Amin: - if (!argnum || next < accum) + if (!argnum || isnan (next) || next < accum) accum = next; break; }