Fix redundant typedef in qrf.c when that file is amalgamated into

tclsqlite3.c.

FossilOrigin-Name: b8f0c71b48953cb6d5a8b3d33d004a31b63c59d59d455f285bf8fa91c3b07129

diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c
index 75cff2749c80d168f3ca293b491456318d350b23..d2cdf8ed562b10d16221feefa3ce23ac19c626b5 100644 (file)
--- a/ext/qrf/qrf.c
+++ b/ext/qrf/qrf.c
@@ -19,7 +19,9 @@
 #include <assert.h>
 #include <stdint.h>
 
+#ifndef SQLITE_AMALGAMATION
 typedef sqlite3_int64 i64;
+#endif
 
 /* A single line in the EQP output */
 typedef struct qrfEQPGraphRow qrfEQPGraphRow;

diff --git a/manifest b/manifest
index d7b0f56d41bb1b532637e53d1398b453f33cb948..1afcc268d617a86283008bd9e7dce56d1213c9b6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sa\sdoc\sreference\sto\sa\srenamed\sfile,\sas\sreported\sby\s[forum:5d9d70c618|forum\spost\s5d9d70c618].\sNo\scode\schanges.
-D 2026-04-07T09:15:21.538
+C Fix\sredundant\stypedef\sin\sqrf.c\swhen\sthat\sfile\sis\samalgamated\sinto\ntclsqlite3.c.
+D 2026-04-07T11:31:41.332
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -421,7 +421,7 @@ F ext/misc/zipfile.c 5a583b5e72b4d777dc9f845529e6bd185d58024b633aafc93588679c787
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md 9e644615d7d7b77ef7e9db798765679e50c5ed12eda48bce21c9ef9eb4715e9d
 F ext/qrf/dev-notes.md e68a6d91ce4c7eb296ef2daadc2bb79c95c317ad15b9fafe40850c67b29c2430
-F ext/qrf/qrf.c 7334c688296f818f99c0cf37318b279ef62982a4860762096158237981fecb06
+F ext/qrf/qrf.c 08aa78e12bc0e422495c532e0529c235dd88a0965a68993abc89dc48379bfefe
 F ext/qrf/qrf.h 13c4f0b5d4aa7a6a556ef66943d6518ef23d9f5b7504c6d5929b785abc675825
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
@@ -2197,8 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 164af3703b8fb5d88612edcceeaae0ae5a230c34c7a0f2ac9b650f5a742b2787
-R 9f758bde619450443d8a4f8211752a93
-U stephan
-Z 9d2ed17cd4db302a9a4e0c15d9f6727b
+P c8121593fa455cd43b3878f8b65ebac47c07dab4b8ce081aa34b14fc9440afbc
+R 9d249f2542f2af41d9defa50204c44ef
+U drh
+Z 1d4d0a42b2a1c7c747e5b84b100e18b6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7824bf2fa3edcbae84b3710bffcf4b53341be2c1..c94874b2e0c16cbee85affb7efa5d745335e37a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8121593fa455cd43b3878f8b65ebac47c07dab4b8ce081aa34b14fc9440afbc
+b8f0c71b48953cb6d5a8b3d33d004a31b63c59d59d455f285bf8fa91c3b07129