diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
| commit | 1eaeccc15d15d15d2f62ea1648f7dd64722dbd37 (patch) | |
| tree | b922cdabc780fa3a8837a6804d2df31793d9e2ca /lib/nimbase.h | |
| parent | e9243a16167b24899d4fcf051f3252b3a5804811 (diff) | |
| parent | bd19b5f4d36bb40b4af93d7e15fdfa582e9fe3b7 (diff) | |
| download | Nim-1eaeccc15d15d15d2f62ea1648f7dd64722dbd37.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'lib/nimbase.h')
| -rw-r--r-- | lib/nimbase.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/nimbase.h b/lib/nimbase.h index 34a2e43e7..76192713b 100644 --- a/lib/nimbase.h +++ b/lib/nimbase.h @@ -396,15 +396,13 @@ typedef struct TStringDesc* string; #define GenericSeqSize sizeof(TGenericSeq) #define paramCount() cmdCount -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__i386__) -# ifndef NAN -static unsigned long nimNaN[2]={0xffffffff, 0x7fffffff}; -# define NAN (*(double*) nimNaN) -# endif -#endif - +// NAN definition copied from math.h included in the Windows SDK version 10.0.14393.0 #ifndef NAN -# define NAN (0.0 / 0.0) +#ifndef _HUGE_ENUF +#define _HUGE_ENUF 1e+300 // _HUGE_ENUF*_HUGE_ENUF must overflow +#endif +#define NAN_INFINITY ((float)(_HUGE_ENUF * _HUGE_ENUF)) +#define NAN ((float)(NAN_INFINITY * 0.0F)) #endif #ifndef INF |