Get shell.c past clang preprocessor, silently.

FossilOrigin-Name: 588c3512286491e2128103bcef0d6b3bdd0a0d0dcdc6bdc3e3068db552d70ed4

diff --git a/manifest b/manifest
index 9f31da9c4ee1247535a20b114780a3dfb4c90c28..07274af45a2aa2ac890a9115c448b38b855aa505 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3x\starget\sto\sother\smakefiles.
-D 2022-04-06T16:47:56.538
+C Get\sshell.c\spast\sclang\spreprocessor,\ssilently.
+D 2022-04-06T17:07:42.374
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -556,7 +556,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c366c05e48e836ea04f8ecefb9c1225745dc250c3f01bdb39e9cbb0dc25e3610
-F src/shell.c.in e9b6e41a5eda0a0f44bda420198c415f2bf65607aa721b02b49af3ea1ae9d93b x
+F src/shell.c.in 3150d39954731f3d484e7df9f8a099e117b8fb2acef56c45fa83f5cca13e6613 x
 F src/shext_linkage.h 307e241b9fdc42ca02387303b0abdffd5afd04a5a8540807a5061a97fb2c26cd
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1951,8 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 45736d46cdca75d0f6eb1a0b9f2702b86851bd1da85f34c0687a3aaadf628975
-R b2e6b06c6246ce010e557fdebac85c3d
+P efc9f08dcb1d64b92dd08e8776abc805d911fbb905758f8af6977f31a6633bb4
+R a86f52f34ea3ff9e2588abf1ce4c4954
 U larrybr
-Z 43415bae21e15d4b000956dcbb54dd2e
+Z 6c3643c3b0e82a3d3fee7c29abbccf02
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c45f0078beb0c5d4d69d041bb15b512b10b3621f..0be30e9e115217ab6d19d332c5d9938505dc443c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-efc9f08dcb1d64b92dd08e8776abc805d911fbb905758f8af6977f31a6633bb4
\ No newline at end of file
+588c3512286491e2128103bcef0d6b3bdd0a0d0dcdc6bdc3e3068db552d70ed4
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index e2f106d62861b6b0a79ee40596ff818f17c027cf..b9da9620e3f5d986d00c04b8fa60933a75726ce1 100755 (executable)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1200,6 +1200,12 @@ struct EQPGraph {
 # define SHELL_OMIT_EXTENSIONS 4
 #endif
 
+#ifdef SQLITE_OMIT_LOAD_EXTENSION
+# define SHELL_OMIT_LOAD_EXTENSION 1
+#else
+# define SHELL_OMIT_LOAD_EXTENSION 0
+#endif
+
 /* Selectively omit features with one PP variable. Value is true iff
 ** either x is not defined or defined with 0 in bitnum bit position.
 */
@@ -1211,7 +1217,7 @@ struct EQPGraph {
   NOT_IFDEF_BIT(SHELL_OMIT_EXTENSIONS, SHEXT_PARSING_BIT)
 /* Whether build will include runtime extension via .load -extension */
 #define SHEXT_DYNEXT_BIT 1
-#define SHELL_DYNAMIC_EXTENSION ( !defined(SQLITE_OMIT_LOAD_EXTENSION) \
+#define SHELL_DYNAMIC_EXTENSION ( !SHELL_OMIT_LOAD_EXTENSION \
   && NOT_IFDEF_BIT(SHELL_OMIT_EXTENSIONS, SHEXT_DYNEXT_BIT) )
 /* Whether build will include expansion of variables in dot-commands */
 #define SHEXT_VAREXP_BIT 2