diff options
| author | drh <> | 2022-11-24 01:41:44 +0000 |
|---|---|---|
| committer | drh <> | 2022-11-24 01:41:44 +0000 |
| commit | 4b1555a9fc77dfaca1ee3eab38a2ba424a9d4ad9 (patch) | |
| tree | 9df8ca7ad4fb96cfb9b0c97497b10152cb758cae /src | |
| parent | 9b80cb5f39af66075762057df127ffbbb2c6ef2a (diff) | |
| parent | f1ce4f40c7a01fd272662ab42d24b1f3ba747069 (diff) | |
| download | sqlite-4b1555a9fc77dfaca1ee3eab38a2ba424a9d4ad9.tar.gz sqlite-4b1555a9fc77dfaca1ee3eab38a2ba424a9d4ad9.zip | |
Merge the latest trunk changes into the agg-with-indexed-expr branch to
simplify diffs.
FossilOrigin-Name: 38c3d3f1ed0fd2bb62aa8a7e5a27f2b247123e094e2fdb0a2475d788c3dfbc04
Diffstat (limited to 'src')
| -rw-r--r-- | src/shell.c.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shell.c.in b/src/shell.c.in index 7f7ec779d..e1f0ecfcd 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1066,9 +1066,11 @@ INCLUDE ../ext/expert/sqlite3expert.c #define SQLITE_SHELL_HAVE_RECOVER 0 #endif #if SQLITE_SHELL_HAVE_RECOVER -INCLUDE ../ext/recover/dbdata.c INCLUDE ../ext/recover/sqlite3recover.h +# ifndef SQLITE_HAVE_SQLITE3R +INCLUDE ../ext/recover/dbdata.c INCLUDE ../ext/recover/sqlite3recover.c +# endif #endif #if defined(SQLITE_ENABLE_SESSION) |