From: dan <Dan Kennedy>
Date: Sat, 13 May 2023 19:13:40 +0000 (+0000)
Subject: Add an "#ifndef SQLITE_HAVE_SQLITE3R" directive to shell.c.in, to avoid including... 
X-Git-Tag: version-3.42.0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd0791587b87f5930cc568246100b67d160c41a3;p=thirdparty%2Fsqlite.git

Add an "#ifndef SQLITE_HAVE_SQLITE3R" directive to shell.c.in, to avoid including the recovery code a second time if the shell is being compiled with sqlite3r.c.

FossilOrigin-Name: 6f1a60fb7b3ef463b4131dfecbc72b7c778c794a9aa13ce4617ab6dd895508b2
---

diff --git a/manifest b/manifest
index a3ebde84d1..7a351492c3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mention\sthat\ssqlite3_mutex_free()\saccepts\sNULL\sas\sa\sno-op.
-D 2023-05-13T15:34:15.805
+C Add\san\s"#ifndef\sSQLITE_HAVE_SQLITE3R"\sdirective\sto\sshell.c.in,\sto\savoid\sincluding\sthe\srecovery\scode\sa\ssecond\stime\sif\sthe\sshell\sis\sbeing\scompiled\swith\ssqlite3r.c.
+D 2023-05-13T19:13:40.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 12aa3168be4ff175702fe0ebeaf544312be22d275d378a28e7b2fad32d552d36
-F src/shell.c.in 1e18312f58d365042036fc9d19dcef416074f783702b168f07814332c2268ee0
+F src/shell.c.in 77e2e145906ef9d87ed4e0028aa06afeb21f34d9bf60447a2f4fb6012ad8558c
 F src/sqlite.h.in c14a4471fcd897a03631ac7ad3d05505e895e7b6419ec5b96cae9bc4df7a9fc6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2069,8 +2069,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 67001887044da71ab50c07d8345bd950a0a1f9688cf9cd6966312ea163cf6e17
-R f137c75703c92c2af2a3b7644ec04694
-U larrybr
-Z a68f3963d62b5a0e832809880b122d2b
+P 603d9ad5012ca8996783996d7b8cd6a1aabf12b21604a2ccc137f4c2d99427b9
+R 704f34dd7e7a4c385b6e7ca83d6b47da
+U dan
+Z 03d9b3bf853393a79360eafbe071771b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 08988c19c4..5981717113 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-603d9ad5012ca8996783996d7b8cd6a1aabf12b21604a2ccc137f4c2d99427b9
\ No newline at end of file
+6f1a60fb7b3ef463b4131dfecbc72b7c778c794a9aa13ce4617ab6dd895508b2
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index ccaed896d9..103bc05ad3 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1349,8 +1349,10 @@ INCLUDE ../ext/expert/sqlite3expert.c
 #endif
 #if SQLITE_SHELL_HAVE_RECOVER
 INCLUDE ../ext/recover/sqlite3recover.h
+# ifndef SQLITE_HAVE_SQLITE3R
 INCLUDE ../ext/recover/dbdata.c
 INCLUDE ../ext/recover/sqlite3recover.c
+# endif /* SQLITE_HAVE_SQLITE3R */
 #endif
 #ifdef SQLITE_SHELL_EXTSRC
 # include SHELL_STRINGIFY(SQLITE_SHELL_EXTSRC)