aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlarrybr <larrybr@noemail.net>2023-04-04 19:56:28 +0000
committerlarrybr <larrybr@noemail.net>2023-04-04 19:56:28 +0000
commitc6c4bae80aa5caa68225048646cb6d5eaf561f70 (patch)
treedfbcd5d337e66d5fd783b4f98fa8c983bcc055a9 /src
parentcd0f540761a1e54a8f2c6d5260315875b642b061 (diff)
downloadsqlite-c6c4bae80aa5caa68225048646cb6d5eaf561f70.tar.gz
sqlite-c6c4bae80aa5caa68225048646cb6d5eaf561f70.zip
Shell to use SQLITE_SHELL_HAVE_RECOVER consistently (correcting check-in 0421cc03e0efa8f1)
FossilOrigin-Name: 5b980d72a03fa1cfd0f1bf3ed04068b9f216b75a304deb2b7bbe8ddce0e6fb96
Diffstat (limited to 'src')
-rw-r--r--src/shell.c.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shell.c.in b/src/shell.c.in
index 582a7594a..cf7606dda 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1183,10 +1183,8 @@ 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
#endif
#ifdef SQLITE_SHELL_EXTSRC
# include SHELL_STRINGIFY(SQLITE_SHELL_EXTSRC)
@@ -5203,7 +5201,7 @@ static void open_db(ShellState *p, int openFlags){
sqlite3_regexp_init(p->db, 0, 0);
sqlite3_ieee_init(p->db, 0, 0);
sqlite3_series_init(p->db, 0, 0);
-#ifndef SQLITE_OMIT_VIRTUALTABLE
+#if SQLITE_SHELL_HAVE_RECOVER
sqlite3_dbdata_init(p->db, 0, 0);
#endif
#ifndef SQLITE_SHELL_FIDDLE
@@ -6021,7 +6019,7 @@ static int db_int(sqlite3 *db, const char *zSql){
return res;
}
-#if defined(SQLITE_SHELL_HAVE_RECOVER)
+#if SQLITE_SHELL_HAVE_RECOVER
/*
** Convert a 2-byte or 4-byte big-endian integer into a native integer
*/