From: drh <>
Date: Sun, 27 Oct 2024 16:12:58 +0000 (+0000)
Subject: Fix build errors in fts5_tcl.c on Mac.
X-Git-Tag: major-relase~316
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d05f9af814503db015a83627f3a80a77494c5a2;p=thirdparty%2Fsqlite.git

Fix build errors in fts5_tcl.c on Mac.

FossilOrigin-Name: 133fff8bd79d46f74eeeee677a929b611f3af79cbc492864211e61e2a35846e9
---

diff --git a/ext/fts5/fts5_tcl.c b/ext/fts5/fts5_tcl.c
index dc5811ce4d..dd2ed82c9e 100644
--- a/ext/fts5/fts5_tcl.c
+++ b/ext/fts5/fts5_tcl.c
@@ -21,6 +21,7 @@
 #include "fts5.h"
 #include <string.h>
 #include <assert.h>
+#include <stdlib.h>
 
 #ifdef SQLITE_DEBUG
 extern int sqlite3_fts5_may_be_corrupt;
@@ -1643,14 +1644,14 @@ void f5tStrFunc(sqlite3_context *pCtx, int nArg, sqlite3_value **apArg){
 
   zText = sqlite3_value_text(apArg[0]);
   if( zText ){
-    int nText = sqlite3Strlen30(zText);
+    sqlite3_int64 nText = strlen(zText);
     char *zCopy = (char*)ckalloc(nText+8);
     if( zCopy==0 ){
       sqlite3_result_error_nomem(pCtx);
     }else{
       zCopy += 8;
       memcpy(zCopy, zText, nText);
-      sqlite3_result_text(pCtx, zCopy, nText, f5tFree);
+      sqlite3_result_text64(pCtx, zCopy, nText, f5tFree, SQLITE_UTF8);
     }
   }
 }
diff --git a/manifest b/manifest
index 5fc5d28931..c5fc4c5b26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\scode\sadded\sby\s[ba358d26].
-D 2024-10-27T15:58:28.881
+C Fix\sbuild\serrors\sin\sfts5_tcl.c\son\sMac.
+D 2024-10-27T16:12:58.185
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -120,7 +120,7 @@ F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a
 F ext/fts5/fts5_index.c 368a968570ce12ba40223e284a588d9f93ee23a0133727f0df1fcd64086b1fb6
 F ext/fts5/fts5_main.c 50eb059e51d730e8e0c77df4e568b018079e112a755c094488b0d5b1aa06afbb
 F ext/fts5/fts5_storage.c 337b05e4c66fc822d031e264d65bde807ec2fab08665ca2cc8aaf9c5fa06792c
-F ext/fts5/fts5_tcl.c 055a52c54a72171f0adbdf674e21ee0b36798eeec7b99243913c43d8aa6496a7
+F ext/fts5/fts5_tcl.c 5b16a249962809b2aaaab964bf58838ea72f30b8b12373cafe612f8cc71e2a40
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
 F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b
 F ext/fts5/fts5_tokenize.c 033e2e43b8e852c0ef6cecc611266d61e2346e52ec7dcfb76a428fe56a07efa9
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 63a8f60f98115d4ee6e40de3ae775770aba76e19df6ddde68bccb7967b0200dc
-R 3f7cd00e3e49e0565ff5c1eb686e6334
-U dan
-Z 219db953539c68d8f9036d10ef1d93d0
+P b7da7980d33e2f2d5d0a4384a43eff39e1a2de4f53b8b4074eea48598a35b9d7
+R a534ed4b3db6daee016a753585ff9b49
+U drh
+Z 8a0f59c10b6f6bb02e3fc54754d114cf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 46f5a11977..361f79d273 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7da7980d33e2f2d5d0a4384a43eff39e1a2de4f53b8b4074eea48598a35b9d7
+133fff8bd79d46f74eeeee677a929b611f3af79cbc492864211e61e2a35846e9