From: stephan <stephan@noemail.net>
Date: Sun, 3 Nov 2024 18:30:45 +0000 (+0000)
Subject: Workaround for a compiler-specific jimsh compilation error reported in [forum:18e420d... 
X-Git-Tag: major-relase~242
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6cdee83036864627e222f2bee2d0f00187efd76;p=thirdparty%2Fsqlite.git

Workaround for a compiler-specific jimsh compilation error reported in [forum:18e420d0b1404d63|forum post 18e420d0]. Reported upstream as [https://github.com/msteveb/jimtcl/issues/322|ticket #322].

FossilOrigin-Name: 29b94495956802d0eedcd669e45308c56278e43aab62bd7c3bb7153b47c9d4c0
---

diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c
index fb4e8b806d..c6d5eb0d4e 100644
--- a/autosetup/jimsh0.c
+++ b/autosetup/jimsh0.c
@@ -19286,7 +19286,7 @@ static int Jim_StringCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a
         JIM_DEF_SUBCMD("trim", "string ?trimchars?", 1, 2),
         JIM_DEF_SUBCMD("trimleft", "string ?trimchars?", 1, 2),
         JIM_DEF_SUBCMD("trimright", "string ?trimchars?", 1, 2),
-        { }
+        JIM_DEF_SUBCMD(0,0,0,0)
     };
     const jim_subcmd_type *ct = Jim_ParseSubCmd(interp, cmds, argc, argv);
     if (!ct) {
@@ -20179,7 +20179,7 @@ static int Jim_DictCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
         JIM_DEF_SUBCMD("for", "vars dictionary script", 3, 3),
         JIM_DEF_SUBCMD("replace", "dictionary ?key value ...?", 1, -1),
         JIM_DEF_SUBCMD("update", "varName ?arg ...? script", 2, -1),
-        { }
+        JIM_DEF_SUBCMD(0,0,0,0)
     };
     const jim_subcmd_type *ct = Jim_ParseSubCmd(interp, cmds, argc, argv);
     if (!ct) {
@@ -20388,7 +20388,7 @@ static int Jim_InfoCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
         JIM_DEF_SUBCMD("statics", "procname", 1, 1),
         JIM_DEF_SUBCMD("vars", "?pattern?", 0, 1),
         JIM_DEF_SUBCMD("version", NULL, 0, 0),
-        { }
+        JIM_DEF_SUBCMD(0,0,0,0)
     };
     const jim_subcmd_type *ct;
 #ifdef jim_ext_namespace
diff --git a/manifest b/manifest
index 6ae9389c14..e92afdde31 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\supdates.\sRemove\stwo\soutdated\stodos.
-D 2024-11-03T07:45:56.350
+C Workaround\sfor\sa\scompiler-specific\sjimsh\scompilation\serror\sreported\sin\s[forum:18e420d0b1404d63|forum\spost\s18e420d0].\sReported\supstream\sas\s[https://github.com/msteveb/jimtcl/issues/322|ticket\s#322].
+D 2024-11-03T18:30:45.368
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -47,7 +47,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
+F autosetup/jimsh0.c 9860c2bd7825cb9d21616237e59a2dfa29acbd98c00da5f842e5abe222e69288
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cb7983c8eb47c9518c3039556e655e5237952d9c068fe36c624e9f6a73cd1098
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 02208e6bfa7b791b958d45ad25eaac3a16d3e9f6ab203b9fc760c67785525395
-R 129876c7397cde2ce7d1cd13dddc82e3
+P ad19237845b7791dd90fa4b3586f39f6ab700462e826baf53d4cde7f7fa06449
+R fbc9af98c69bf3f4eab9e4f1eaa6856c
 U stephan
-Z 719bb9a6901f4e1cd5a5816d1e6f64dc
+Z cd366cd0592f2836fdc5215675eb9eb6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1c517a5a63..c52d720347 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad19237845b7791dd90fa4b3586f39f6ab700462e826baf53d4cde7f7fa06449
+29b94495956802d0eedcd669e45308c56278e43aab62bd7c3bb7153b47c9d4c0