Make the sqlite3IsNaN() function a macro that evaluates to FALSE when

compiled with SQLITE_OMIT_FLOATING_POINT.

FossilOrigin-Name: 56f232d562bc239103a5afd2e64c4b926a20de08

diff --git a/manifest b/manifest
index aee39911843da508794fc378342e643adbcfd351..f89176e07388da81c160fa827b63acc7d441e3bc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C When\sSQLITE_OMIT_FLOATING_POINT\sis\sdefined,\sthe\sfloating-point\sformats\sin\nthe\ssqlite3_*printf()\sfunctions\sshould\spull\san\sint64\soff\sof\sthe\sparameter\nlist\sand\signore\sit.
-D 2010-01-13T16:43:27
+C Make\sthe\ssqlite3IsNaN()\sfunction\sa\smacro\sthat\sevaluates\sto\sFALSE\swhen\ncompiled\swith\sSQLITE_OMIT_FLOATING_POINT.
+D 2010-01-13T17:39:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -169,7 +169,7 @@ F src/select.c 0109b993c360d649857523abb72919e1794f9b45
 F src/shell.c b95c5fcfe458027f192914a47474652969a1ec0f
 F src/sqlite.h.in d493cf5029de67fe7252324473d89140a007a6c4
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h d6c48b1a5cd6485151e1d1b071dbe0a85ceb70fe
+F src/sqliteInt.h 02d9bef4b1b0ac4591b4b21eb8cc088da98efb4d
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
 F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -210,7 +210,7 @@ F src/tokenize.c e7f3606cc1b51a819a2bfee99100648d35bc791d
 F src/trigger.c d46f9389e3bf3dd1cc1d288aba2f289c96b34200
 F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
-F src/util.c 4f0fb8561b7576a450fc86212ac7f7800e169077
+F src/util.c aa0b1da8f71edff84b4b41dbe05fe6ac75d819c6
 F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
 F src/vdbe.c b0c18b5c5ab4745a09b8f164e5db36413d98872e
 F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
@@ -788,14 +788,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e12da0d316fcc34a75554d59fe6d11d9f0e059e2
-R 356750da68b38dd3fbb8aa2463323a2a
+P 3fd6f9ad06b786116ca18c1e812363d30cd3060e
+R 9c4726b877b18c84b124339d8c77faa9
 U drh
-Z 14a6655f5ff26845eed059d637c77f11
+Z 07d8356cf770ce4fd434801b14df39ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLTfgyoxKgR168RlERAmWDAJ4zLspJTSZ3W3wpJCaE/S/Z2HpGngCfSqgd
-KuQNVs6DYPwCohTNe8i0Qlg=
-=9gOo
+iD8DBQFLTgVtoxKgR168RlERAk1KAJ9dMLQYGS22KQsh7/jad4TrbBhjmgCeJ8lU
+1peDSTkv+y/ya8z6lODMkI8=
+=6Wje
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 7d0822ced47ecdfb7e72b4c19ba3f0134cb9c283..ff97b61eadfd4ddef0416abf056d918b462bc4c5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3fd6f9ad06b786116ca18c1e812363d30cd3060e
\ No newline at end of file
+56f232d562bc239103a5afd2e64c4b926a20de08
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f9a732cabb6d65abb6b08d766b0ffd1a1c70a85b..060b0d7ffcdbe83cfaf89b30aeddf79716a8613c 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2532,7 +2532,11 @@ int sqlite3StatusValue(int);
 void sqlite3StatusAdd(int, int);
 void sqlite3StatusSet(int, int);
 
-int sqlite3IsNaN(double);
+#ifndef SQLITE_OMIT_FLOATING_POINT
+  int sqlite3IsNaN(double);
+#else
+# define sqlite3IsNaN(X)  0
+#endif
 
 void sqlite3VXPrintf(StrAccum*, int, const char*, va_list);
 #ifndef SQLITE_OMIT_TRACE

diff --git a/src/util.c b/src/util.c
index 36498f95236a6b05087809f9e6e7ebdf49ffea5b..f5c996425c53e05eef154ba9922f8392a975a582 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -31,6 +31,7 @@ void sqlite3Coverage(int x){
 }
 #endif
 
+#ifndef SQLITE_OMIT_FLOATING_POINT
 /*
 ** Return true if the floating point value is Not a Number (NaN).
 **
@@ -75,6 +76,7 @@ int sqlite3IsNaN(double x){
   testcase( rc );
   return rc;
 }
+#endif /* SQLITE_OMIT_FLOATING_POINT */
 
 /*
 ** Compute a string length that is limited to what can be stored in