luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix commit "ngspice.h, cm.h, cleanup NAN defines"

This commit is contained in:
rlar 2016-04-02 12:05:46 +02:00
parent d58fd306f3
commit cff23b8d38
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/ngspice/cm.h
View File

@ -45,9 +45,11 @@ NON-STANDARD FEATURES
#include "ngspice/cmproto.h" #include "ngspice/cmproto.h"
#include "ngspice/mifcmdat.h" #include "ngspice/mifcmdat.h"
#include <math.h>
#if !defined(NAN) #if !defined(NAN)
#if defined(_MSC_VER) && (_MSC_VER < 1800) #if defined(_MSC_VER)
/* VS 2012 or less cannot evaluate 0.0/0.0 */ /* NAN is not defined in VS 2012 or older */
static const __int64 global_nan = 0x7ff8000000000000i64; static const __int64 global_nan = 0x7ff8000000000000i64;
#define NAN (*(const double *) &global_nan) #define NAN (*(const double *) &global_nan)
#else #else

4
src/include/ngspice/ngspice.h
View File

@ -206,8 +206,8 @@ extern double x_atanh(double);
#endif #endif
#if !defined(NAN) #if !defined(NAN)
#if defined(_MSC_VER) && (_MSC_VER < 1800) #if defined(_MSC_VER)
/* VS 2012 or less cannot evaluate 0.0/0.0 */ /* NAN is not defined in VS 2012 or older */
static const __int64 global_nan = 0x7ff8000000000000i64; static const __int64 global_nan = 0x7ff8000000000000i64;
#define NAN (*(const double *) &global_nan) #define NAN (*(const double *) &global_nan)
#else #else