From: drh <>
Date: Thu, 31 Oct 2024 11:19:22 +0000 (+0000)
Subject: Improved differentiation between antirez and msteveb linenoise.
X-Git-Tag: major-relase~253
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3764f632b894847d2acbe61122d20c60f1ce80a9;p=thirdparty%2Fsqlite.git

Improved differentiation between antirez and msteveb linenoise.

FossilOrigin-Name: cfb4bfcf1498b3740d210c24a71be343e8e0f262f3d9bddd45a673011307068c
---

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 19278aaf4b..a607a0d149 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1009,25 +1009,9 @@ proc proj-redefine-cc-for-build {} {
 # msteveb, and 0 if it's neither.
 proc proj-which-linenoise {dotH} {
   set srcHeader [proj-file-content $dotH]
-  set srcMain {
-    int main(void) {
-      linenoiseSetCompletionCallback(0$arg)
-      /* antirez has only 1 arg, msteveb has 2 */;
-      return 0;
-    }
-  }
-  set arg ""
-  append source $srcHeader [subst $srcMain]
-  if {[cctest -nooutput 1 -source $source]} {
-    return 1
-  }
-  set source {
-    #include <stddef.h> /* size_t */
-  }
-  set arg ", 0"
-  append source $srcHeader [subst $srcMain]
-  if {[cctest -nooutput 1 -source $source]} {
+  if {[string match *userdata* $srcHeader]} {
     return 2
+  } else {
+    return 1
   }
-  return 0
 }
diff --git a/manifest b/manifest
index 497cf46a19..3226f2b2c2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\smissing\s'close'\scall\sto\sproj-file-content-list.
-D 2024-10-31T09:25:58.617
+C Improved\sdifferentiation\sbetween\santirez\sand\smsteveb\slinenoise.
+D 2024-10-31T11:19:22.925
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -49,7 +49,7 @@ F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bd
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl fb1bd72961082ed50c0a03c2254664d4d765d8d593929f171b6f371090a31a03
+F autosetup/proj.tcl b1a10140de41c4538959feec4032bc40b83d7b8f235e7b331040da87988b36e4
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
 F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@ -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 babf66f5c7074c24ca8ae898cd850964e99cef41fd1395a0d6c582cab75ae3bf
-R 1566d9e697ff519ff3abad2856793988
-U stephan
-Z 5342ae504826c884cc1ebd55b932924b
+P 005702f334e7c51d83fc1b142ab90fa6867c4c2e75c8a3d2a17e07669b47fb23
+R 18dc2f778b8898bf0fa14c0afd13b18b
+U drh
+Z 75daa62785acb8fad58113e17b1479b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3a3317e586..4e731d9515 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-005702f334e7c51d83fc1b142ab90fa6867c4c2e75c8a3d2a17e07669b47fb23
+cfb4bfcf1498b3740d210c24a71be343e8e0f262f3d9bddd45a673011307068c