Browse Source

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

pre-master-46
rlar 10 years ago
parent
commit
cff23b8d38
  1. 6
      src/include/ngspice/cm.h
  2. 4
      src/include/ngspice/ngspice.h

6
src/include/ngspice/cm.h

@ -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)
/* VS 2012 or less cannot evaluate 0.0/0.0 */
#if defined(_MSC_VER)
/* 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

@ -206,8 +206,8 @@ extern double x_atanh(double);
#endif #endif
#if !defined(NAN) #if !defined(NAN)
#if defined(_MSC_VER) && (_MSC_VER < 1800)
/* VS 2012 or less cannot evaluate 0.0/0.0 */
#if defined(_MSC_VER)
/* 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

Loading…
Cancel
Save