diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:57 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:57 +0000 |
| commit | 9b97b8fed970afe1edcae8b49281c072b92c93d0 (patch) | |
| tree | 5e933832179cd56eb86c79d942f73df4d9c36dcc /src/util.c | |
| parent | 7bb6e8e16962d2201a5d61d5e02a52b4d453786c (diff) | |
| parent | 8d9da63dacde128e546f84cb34392188aab1be83 (diff) | |
| download | sqlite-9b97b8fed970afe1edcae8b49281c072b92c93d0.tar.gz sqlite-9b97b8fed970afe1edcae8b49281c072b92c93d0.zip | |
Merge updates from trunk.
FossilOrigin-Name: ca5f2c545216c82486e66d26f55b49cbf351ffdc
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.c b/src/util.c index ab409fa25..6e64242e8 100644 --- a/src/util.c +++ b/src/util.c @@ -17,7 +17,7 @@ */ #include "sqliteInt.h" #include <stdarg.h> -#ifdef SQLITE_HAVE_ISNAN +#if HAVE_ISNAN || SQLITE_HAVE_ISNAN # include <math.h> #endif @@ -58,7 +58,7 @@ int sqlite3FaultSim(int iTest){ */ int sqlite3IsNaN(double x){ int rc; /* The value return */ -#if !defined(SQLITE_HAVE_ISNAN) +#if !SQLITE_HAVE_ISNAN && !HAVE_ISNAN /* ** Systems that support the isnan() library function should probably ** make use of it by compiling with -DSQLITE_HAVE_ISNAN. But we have @@ -88,9 +88,9 @@ int sqlite3IsNaN(double x){ volatile double y = x; volatile double z = y; rc = (y!=z); -#else /* if defined(SQLITE_HAVE_ISNAN) */ +#else /* if HAVE_ISNAN */ rc = isnan(x); -#endif /* SQLITE_HAVE_ISNAN */ +#endif /* HAVE_ISNAN */ testcase( rc ); return rc; } |