/ Check-in [51ce713c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:A better way of handling the USE_SYSTEM_SQLITE #define in shell.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:51ce713c6ee91bdf0126155334dcc800b3daa509
User & Date: drh 2014-02-27 15:11:52
Context
2014-02-28
19:37
Provide an #ifdef in shell.c to work around issues when cross-compiling from Ubuntu to windows. check-in: 0a3579d9 user: drh tags: trunk
2014-02-27
20:52
Merge in latest trunk changes. check-in: 8f30b095 user: dan tags: experimental
15:11
A better way of handling the USE_SYSTEM_SQLITE #define in shell.c. check-in: 51ce713c user: drh tags: trunk
15:04
Add #defines to the command-line shell source code (shell.c) so that it can be imported directly into other projects (ex: Fossil) and used without editing. check-in: a6690400 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.c.

  3544   3544     struct callback_data data;
  3545   3545     const char *zInitFile = 0;
  3546   3546     char *zFirstCmd = 0;
  3547   3547     int i;
  3548   3548     int rc = 0;
  3549   3549     int warnInmemoryDb = 0;
  3550   3550   
  3551         -#if !defined(USE_SYSTEM_SQLITE) || USE_SYSTEM_SQLITE!=1
         3551  +#if USE_SYSTEM_SQLITE+0!=1
  3552   3552     if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
  3553   3553       fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
  3554   3554               sqlite3_sourceid(), SQLITE_SOURCE_ID);
  3555   3555       exit(1);
  3556   3556     }
  3557   3557   #endif
  3558   3558     Argv0 = argv[0];