From: drh <>
Date: Tue, 5 Oct 2021 15:30:52 +0000 (+0000)
Subject: Fix separate compilation of json1.c, which was apparently broken by
X-Git-Tag: version-3.37.0~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a726fa17557cf550acb5e8e8dbca11f7d924004;p=thirdparty%2Fsqlite.git

Fix separate compilation of json1.c, which was apparently broken by
check-in [32f33f356931242b].

FossilOrigin-Name: 0c7ece6792d30bdb314e2a6e61d0c051c3619a2d749f8b1df7dc2b1f521388bf
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 6aa4e97f9d..0a3e907be6 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -96,6 +96,19 @@ static const char jsonIsSpace[] = {
   typedef unsigned int u32;
   typedef unsigned short int u16;
   typedef unsigned char u8;
+# if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
+#   define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
+# endif
+# if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
+#   define ALWAYS(X)      (1)
+#   define NEVER(X)       (0)
+# elif !defined(NDEBUG)
+#   define ALWAYS(X)      ((X)?1:(assert(0),0))
+#   define NEVER(X)       ((X)?(assert(0),1):0)
+# else
+#   define ALWAYS(X)      (X)
+#   define NEVER(X)       (X)
+# endif
 #endif
 
 /* Objects */
diff --git a/manifest b/manifest
index 4468818d92..a666dd2d25 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\schange\sto\sFTS5\sto\shelp\sstatic\sanalyzers\sunderstand\sthat\sit\sis\snot\ndereferencing\sa\sNULL\spointer.
-D 2021-10-05T13:00:50.994
+C Fix\sseparate\scompilation\sof\sjson1.c,\swhich\swas\sapparently\sbroken\sby\ncheck-in\s[32f33f356931242b].
+D 2021-10-05T15:30:52.545
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -306,7 +306,7 @@ F ext/misc/fileio.c 57fefd0efc535e62bb8b07fa146875171481da81a759bbfbe2fc91bab900
 F ext/misc/fossildelta.c 1240b2d3e52eab1d50c160c7fe1902a9bd210e052dc209200a750bbf885402d5
 F ext/misc/fuzzer.c eae560134f66333e9e1ca4c8ffea75df42056e2ce8456734565dbe1c2a92bf3d
 F ext/misc/ieee754.c 91a5594071143a4ab79c638fe9f059af1db09932faf2e704c3e29216a7d4f511
-F ext/misc/json1.c f204a61f7c4436261dcb0423ff48395ac53fcfc44ea3a74a77a2a4f47b8c61e2
+F ext/misc/json1.c 1a278d675235c1ccf096e8b83e1999aabbd2941edf96c9cfe00bd58386596aa0
 F ext/misc/memstat.c 3017a0832c645c0f8c773435620d663855f04690172316bd127270d1a7523d4d
 F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b
 F ext/misc/memvfs.c 7dffa8cc89c7f2d73da4bd4ccea1bcbd2bd283e3bb4cea398df7c372a197291b
@@ -1929,7 +1929,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 2483310d15022b47109b44c86e100f5894be7a45a0568dfef6aea80e6c518654
-R 9285f1b08a8a281a7dc87624d697ac42
+P 0d853df1b19a0270b2cb0ebdf5df8067572f19ab9a82d047cb047f3f9e850348
+R 63be5c84a35184416ddc69495763d671
 U drh
-Z cf71305744e2964d45d264476deebc14
+Z d82694695e4c51961e1d1391abd9f9a9
diff --git a/manifest.uuid b/manifest.uuid
index 3cac40d217..03416392ec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d853df1b19a0270b2cb0ebdf5df8067572f19ab9a82d047cb047f3f9e850348
\ No newline at end of file
+0c7ece6792d30bdb314e2a6e61d0c051c3619a2d749f8b1df7dc2b1f521388bf
\ No newline at end of file