From: drh <drh@noemail.net>
Date: Fri, 10 May 2019 12:14:51 +0000 (+0000)
Subject: Fix the previous check-in [db9acef14d492121] so that the amalgamation build
X-Git-Tag: version-3.29.0~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e6dc5d9081f20a52ae38d6f5009cbfaf3bf72dc;p=thirdparty%2Fsqlite.git

Fix the previous check-in [db9acef14d492121] so that the amalgamation build
works for systems for which lack HAVE_ISNAN.

FossilOrigin-Name: 3cc55e09e6c1de2059d97bdddf2fdfbdcc62c584b513f56faf9d3a39ef80cddd
---

diff --git a/manifest b/manifest
index 3d96d7b08e..a9cc2d9f39 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sround()\sSQL\sfunction\sso\sthat\sit\shandles\sinfinities\scorrectly.
-D 2019-05-10T12:06:47.844
+C Fix\sthe\sprevious\scheck-in\s[db9acef14d492121]\sso\sthat\sthe\samalgamation\sbuild\nworks\sfor\ssystems\sfor\swhich\slack\sHAVE_ISNAN.
+D 2019-05-10T12:14:51.652
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -591,7 +591,7 @@ F src/trigger.c bb034c08eca111e66a19cda045903a12547c1be2294b5570d794b869d9c44a73
 F src/update.c 3cb9150d2cf661d938e2f1b1749945f3faa767f88febdb739ab1793bbf895ff2
 F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
-F src/util.c 5061987401c2e8003177fa30d73196aa036727c8f04bf36a2df0c82b1904a236
+F src/util.c 4c0669e042b4e50a08a9e5fd14cecc76e5f877efa288533dccddb6fe98f4d6b5
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 F src/vdbe.c d4efd6e5ecff8eeef280ce5d622dc2c0cfe085014e5813401b346517574adb18
 F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
@@ -1825,7 +1825,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1dfc95b8673b0e8c9ef5040c2fa0fbe9846e430d104e9b83f3f1f3ad63446380
-R 1f6028dc117986e4cb94c6a37ac54229
+P db9acef14d49212108c8082cc15a9b9b4a56b8afe4fe1104ddf62783739c1fbe
+R 2ae89586bd0923bfda8598a9d4f487b2
 U drh
-Z e3e8a7ace76308cd59f6bff482696fb7
+Z c5db4a9c420d2bf9fb0aafb4f42e2d4b
diff --git a/manifest.uuid b/manifest.uuid
index 9134298226..71fd3f249e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db9acef14d49212108c8082cc15a9b9b4a56b8afe4fe1104ddf62783739c1fbe
\ No newline at end of file
+3cc55e09e6c1de2059d97bdddf2fdfbdcc62c584b513f56faf9d3a39ef80cddd
\ No newline at end of file
diff --git a/src/util.c b/src/util.c
index d12e55516f..6d619e231c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -17,9 +17,7 @@
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
-#if HAVE_ISNAN || SQLITE_HAVE_ISNAN
-# include <math.h>
-#endif
+#include <math.h>
 
 /*
 ** Routine needed to support the testcase() macro.