A better way of handling the USE_SYSTEM_SQLITE #define in shell.c.

FossilOrigin-Name: 51ce713c6ee91bdf0126155334dcc800b3daa509

diff --git a/manifest b/manifest
index 7ec2f4b525578ec98d7d08a283e9f7bdce90a860..6892cecea2d73820cd819534db6114c39702786f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s#defines\sto\sthe\scommand-line\sshell\ssource\scode\s(shell.c)\sso\sthat\sit\ncan\sbe\simported\sdirectly\sinto\sother\sprojects\s(ex:\sFossil)\sand\sused\swithout\s\nediting.
-D 2014-02-27T15:04:13.436
+C A\sbetter\sway\sof\shandling\sthe\sUSE_SYSTEM_SQLITE\s#define\sin\sshell.c.
+D 2014-02-27T15:11:52.919
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c ca8b99d894164435f5c55cb304c1b8121705c51e
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 35b07a47fdee9a98e03c4ffb3801026c72114cb7
-F src/shell.c 720e79facdae4787e7bfa577dae6b37a685244b0
+F src/shell.c bf75ce6bea4c8f56c1b46bee201c25acddffb675
 F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1152,7 +1152,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 06c2db875e6cabd81c2a153b2fa4aba03eaed268
-R b72dc063fb220f3231791c5c73300f82
+P a6690400235705ecc0d1a60dacff6ad5fb1f944a
+R d9e4cc8c2428822c2a58511d3bd2892d
 U drh
-Z d3f85704b6a67858d1c2e6d5e8f9f735
+Z 2ca6d024109a270000c3879d5e05ce0a

diff --git a/manifest.uuid b/manifest.uuid
index 03c67c2593526ada6c03060a0b788a7d9418825c..5a0d8578c1994ded43f5774235bb39fa5f814a68 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a6690400235705ecc0d1a60dacff6ad5fb1f944a
\ No newline at end of file
+51ce713c6ee91bdf0126155334dcc800b3daa509
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 3cd7aaf892f111ba28babbfa280897ca3c592579..6815c489e65e8951ea06d8ea826b87f1839e5ee1 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3548,7 +3548,7 @@ int main(int argc, char **argv){
   int rc = 0;
   int warnInmemoryDb = 0;
 
-#if !defined(USE_SYSTEM_SQLITE) || USE_SYSTEM_SQLITE!=1
+#if USE_SYSTEM_SQLITE+0!=1
   if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
     fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
             sqlite3_sourceid(), SQLITE_SOURCE_ID);