From: drh <drh@noemail.net>
Date: Wed, 13 Jan 2010 15:15:40 +0000 (+0000)
Subject: Make the doubleToInt64() routine a pass-through when using OMIT_FLOATING_POINT.
X-Git-Tag: version-3.7.2~641
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52d14521fa428d232b61b3b73bcfbb53c6e2d3e4;p=thirdparty%2Fsqlite.git

Make the doubleToInt64() routine a pass-through when using OMIT_FLOATING_POINT.

FossilOrigin-Name: 417167182efaa1da74008952137de3e00c23494e
---

diff --git a/manifest b/manifest
index 44ef4c0b67..4ad93f2a0c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\stests\sto\sbackup.test\sto\sverify\sthat\sSQLite\sbehaves\sas\sexpected\swhen\sthe\ssource\sdatabase\sis\smodified\smid-backup.
-D 2010-01-13T14:08:01
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Make\sthe\sdoubleToInt64()\sroutine\sa\spass-through\swhen\susing\sOMIT_FLOATING_POINT.
+D 2010-01-13T15:15:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -215,7 +218,7 @@ F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
 F src/vdbeapi.c fc3787eb2f5487d4cc3444de42d56f2e39d311f5
 F src/vdbeaux.c 2e4a421bd3771ecd3b6c9a1c7abc7270a787a01b
 F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
-F src/vdbemem.c a0fa68734dfc2692f5dee4968def1981e34f3549
+F src/vdbemem.c 1ce5005ee4a1ee25ef677abdcaef1259261cc252
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@@ -785,7 +788,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dfc6595d347ea87923a857778b68751103f535d2
-R af14a12e0fb93ccaa943052917036ca2
-U dan
-Z 2a08504403cd615454c575ebb53e6c12
+P 985d3bec07430536485056bcd2ae0471791601ed
+R 9f8cf667b0afbdd9545d404fbec2bd6d
+U drh
+Z d1d141aad07484d109238464ff4bf4c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFLTeOfoxKgR168RlERAlU4AJ4w8Z8Bt+r/4+9pC7Gb2JRnglriKQCeODzf
+Bnr1B7NVjy4Q6Uvl11ICxqI=
+=xtZb
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 80af0a0ba9..bc0433dc2a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-985d3bec07430536485056bcd2ae0471791601ed
\ No newline at end of file
+417167182efaa1da74008952137de3e00c23494e
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 0acab551b0..eb6b169818 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -315,6 +315,10 @@ void sqlite3VdbeMemRelease(Mem *p){
 ** before attempting the conversion.
 */
 static i64 doubleToInt64(double r){
+#ifdef SQLITE_OMIT_FLOATING_POINT
+  /* When floating-point is omitted, double and int64 are the same thing */
+  return r;
+#else
   /*
   ** Many compilers we encounter do not define constants for the
   ** minimum and maximum 64-bit integers, or they define them
@@ -336,6 +340,7 @@ static i64 doubleToInt64(double r){
   }else{
     return (i64)r;
   }
+#endif
 }
 
 /*