diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-03-31 17:21:13 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-03-31 17:21:13 (GMT) |
| commit | b8f08b6a474598d1f1ccf29ff84ad90eb5aa329c (patch) | |
| tree | 7a0667bb483032d8717048e89062abfde308f0aa /generic | |
| parent | ae9e1cb6567ceb048c70832079dfbd8d7ba7fe8f (diff) | |
| download | tcl-b8f08b6a474598d1f1ccf29ff84ad90eb5aa329c.zip tcl-b8f08b6a474598d1f1ccf29ff84ad90eb5aa329c.tar.gz tcl-b8f08b6a474598d1f1ccf29ff84ad90eb5aa329c.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInt.h | 14 | ||||
| -rw-r--r-- | generic/tclObj.c | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 23c8adb..8a71b59 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.362 2008/01/23 21:32:36 dgp Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.362.2.1 2008/03/31 17:21:14 dgp Exp $ */ #ifndef _TCLINT @@ -3768,11 +3768,15 @@ MODULE_SCOPE void TclBNInitBignumFromWideUInt(mp_int *bignum, */ #ifdef _MSC_VER -#define TclIsInfinite(d) ( ! (_finite((d))) ) -#define TclIsNaN(d) (_isnan((d))) +# define TclIsInfinite(d) ( ! (_finite((d))) ) +# define TclIsNaN(d) (_isnan((d))) #else -#define TclIsInfinite(d) ( (d) > DBL_MAX || (d) < -DBL_MAX ) -#define TclIsNaN(d) ((d) != (d)) +# define TclIsInfinite(d) ( (d) > DBL_MAX || (d) < -DBL_MAX ) +# ifdef NO_ISNAN +# define TclIsNaN(d) ((d) != (d)) +# else +# define TclIsNaN(d) (isnan(d)) +# endif #endif /* diff --git a/generic/tclObj.c b/generic/tclObj.c index 0b2fddb..700b112 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -13,12 +13,13 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclObj.c,v 1.139 2007/12/13 15:23:19 dgp Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.139.2.1 2008/03/31 17:21:15 dgp Exp $ */ #include "tclInt.h" #include "tommath.h" #include <float.h> +#include <math.h> /* * Table of all object types. |