From: larrybr <larrybr@noemail.net>
Date: Fri, 16 Apr 2021 10:25:54 +0000 (+0000)
Subject: Dial back assumptions on compile option defaults to reflect actual conditionals.
X-Git-Tag: version-3.36.0~83^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae13144ef058dceae3177dc5e0375eacfa12d84;p=thirdparty%2Fsqlite.git

Dial back assumptions on compile option defaults to reflect actual conditionals.

FossilOrigin-Name: cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359
---

diff --git a/manifest b/manifest
index 0bec6dcbb1..08c89acab9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfrom\s(forked)\strunk.\sHandle\scompile\soptions\sthat\sdiffer\sfrom\sdefault\sby\sbeing\s0.
-D 2021-04-15T23:43:25.989
+C Dial\sback\sassumptions\son\scompile\soption\sdefaults\sto\sreflect\sactual\sconditionals.
+D 2021-04-16T10:25:54.528
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -489,7 +489,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae
 F src/build.c 9f15ff3e074d3989cc1396f575118eb4c28fb677d33f54393ec263799c94b5bd
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c b3886a79e23e71d8e2acbee090bf08f13f4efd0312d06c64e910b76bf8eb3e5a
+F src/ctime.c fbc6243075128ddf187ec469a6d178ebd58bb6eae8e3ba191446fa18cffb17c3
 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@ -1839,7 +1839,7 @@ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 7e5fc6eca3c701dcb0f669eefaff3d872f00708c2902561759a4a0b193d2e97e
+F tool/mkctimec.tcl 6469850ad5e9f9173046da7569a0a6f40c5b21316406b70aaa029b357bc8d220
 F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
@@ -1912,7 +1912,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 63ea3e298c575a408e5c5e12368292c966db6dcffcb6e1c770734f28b8757635 2363a14ca723c0343fbe350f6c19787a7a47c2289fd9af136c97a451b53b5226
-R a2d0ebd6bfcd194144667102be607922
+P 6eb83f83d280f82bd225972f52c52922257303740a968457ff0be08d43993d59
+R 81b6477b1bd41ea5f96a630ccfc9d907
 U larrybr
-Z da3344fd449b8db410018370a9ecf455
+Z cb4d1f0cfcf57b3bffb8efd3b5ca63ec
diff --git a/manifest.uuid b/manifest.uuid
index 5f9595b546..f7982e889e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6eb83f83d280f82bd225972f52c52922257303740a968457ff0be08d43993d59
\ No newline at end of file
+cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359
\ No newline at end of file
diff --git a/src/ctime.c b/src/ctime.c
index 2f17ca7608..7aae08d746 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -475,11 +475,6 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_MUTEX_NOOP
   "MUTEX_NOOP",
 #endif
-#ifdef SQLITE_MUTEX_NREF
-# if SQLITE_MUTEX_NREF != 1
-  "MUTEX_NREF=" CTIMEOPT_VAL(SQLITE_MUTEX_NREF),
-# endif
-#endif
 #if SQLITE_MUTEX_OMIT
   "MUTEX_OMIT",
 #endif
@@ -549,10 +544,8 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_OMIT_CTE
   "OMIT_CTE",
 #endif
-#ifdef SQLITE_OMIT_DATETIME_FUNCS
-# if SQLITE_OMIT_DATETIME_FUNCS != 1
-  "OMIT_DATETIME_FUNCS=" CTIMEOPT_VAL(SQLITE_OMIT_DATETIME_FUNCS),
-# endif
+#if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT)
+  "OMIT_DATETIME_FUNCS",
 #endif
 #if SQLITE_OMIT_DECLTYPE
   "OMIT_DECLTYPE",
@@ -593,10 +586,8 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_OMIT_LIKE_OPTIMIZATION
   "OMIT_LIKE_OPTIMIZATION",
 #endif
-#ifdef SQLITE_OMIT_LOAD_EXTENSION
-# if SQLITE_OMIT_LOAD_EXTENSION != 1
-  "OMIT_LOAD_EXTENSION=" CTIMEOPT_VAL(SQLITE_OMIT_LOAD_EXTENSION),
-# endif
+#if SQLITE_OMIT_LOAD_EXTENSION
+  "OMIT_LOAD_EXTENSION",
 #endif
 #if SQLITE_OMIT_LOCALTIME
   "OMIT_LOCALTIME",
@@ -731,10 +722,11 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_SUBSTR_COMPATIBILITY
   "SUBSTR_COMPATIBILITY",
 #endif
-#ifdef SQLITE_SYSTEM_MALLOC
-# if SQLITE_SYSTEM_MALLOC != 1
-  "SYSTEM_MALLOC=" CTIMEOPT_VAL(SQLITE_SYSTEM_MALLOC),
-# endif
+#if (!defined(SQLITE_WIN32_MALLOC) \
+     && !defined(SQLITE_ZERO_MALLOC) \
+     && !defined(SQLITE_MEMDEBUG) \
+    ) || defined(SQLITE_SYSTEM_MALLOC)
+  "SYSTEM_MALLOC",
 #endif
 #if SQLITE_TCL
   "TCL",
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 1d4607e253..2861ae93d4 100644
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -14,15 +14,10 @@
 #
 set boolean_defnnz_options {
   {SQLITE_HOMEGROWN_RECURSIVE_MUTEX 1}
-  {SQLITE_OMIT_LOAD_EXTENSION 1}
   {SQLITE_POWERSAFE_OVERWRITE 1}
   {SQLITE_DEFAULT_MEMSTATUS 1}
-  {SQLITE_SYSTEM_MALLOC 1}
-  {SQLITE_OMIT_DATETIME_FUNCS 1}
   {SQLITE_OMIT_TRACE 1}
-  {SQLITE_ENABLE_FTS3 1}
   {SQLITE_ALLOW_COVERING_INDEX_SCAN 1}
-  {SQLITE_MUTEX_NREF 1}
 }
 
 # All Boolean compile time options which default to 0 or empty.
@@ -158,6 +153,7 @@ set boolean_defnil_options {
   SQLITE_OMIT_INTEGRITY_CHECK
   SQLITE_OMIT_INTROSPECTION_PRAGMAS
   SQLITE_OMIT_LIKE_OPTIMIZATION
+  SQLITE_OMIT_LOAD_EXTENSION
   SQLITE_OMIT_LOCALTIME
   SQLITE_OMIT_LOOKASIDE
   SQLITE_OMIT_MEMORYDB
@@ -287,6 +283,19 @@ set options(HAVE_ISNAN) {
   "HAVE_ISNAN",
 #endif
 }
+set options(OMIT_DATETIME_FUNCS) {
+#if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT)
+  "OMIT_DATETIME_FUNCS",
+#endif
+}
+set options(SYSTEM_MALLOC) "\
+#if (!defined(SQLITE_WIN32_MALLOC) \\
+     && !defined(SQLITE_ZERO_MALLOC) \\
+     && !defined(SQLITE_MEMDEBUG) \\
+    ) || defined(SQLITE_SYSTEM_MALLOC)
+  \"SYSTEM_MALLOC\",
+#endif
+"
 set options(THREADSAFE) {
 #if defined(SQLITE_THREADSAFE)
   "THREADSAFE=" CTIMEOPT_VAL(SQLITE_THREADSAFE),