Fossil: Check-in [a526d719]

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

Overview

Comment:	Improvements to the handling of USE_SYSTEM_SQLITE in shell.c.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	a526d71968062df01a4039abef93fbb98a1b1bea
User & Date:	drh 2014-02-27 15:12:34

Context

2014-03-10
21:51		Update internal SQLite to version 3.8.4 check-in: 92f31e01 user: jan.nijtmans tags: branch-1.28
2014-02-27
16:21		Add "Quit" and "Save As.." buttons to the "diff --tk" command. check-in: 29d80dd2 user: drh tags: trunk
15:40		Merge in latest fixes/development from trunk. check-in: 1fb468ed user: andybradford tags: http-auth
15:12		Improvements to the handling of USE_SYSTEM_SQLITE in shell.c. check-in: a526d719 user: drh tags: trunk
15:05		Update the built-in SQLite the latest pre-3.8.4 trunk version. Modify the way the "shell.c" source file is used so that it can be imported directly from the SQLite source tree without having to be edited. check-in: c92a3dda user: drh tags: trunk

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/shell.c.

  struct callback_data data;
  const char *zInitFile = 0;
  char *zFirstCmd = 0;
  int i;
  int rc = 0;
  int warnInmemoryDb = 0;

#if !defined(USE_SYSTEM_SQLITE) || USE_SYSTEM_SQLITE!=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);
    exit(1);
  }
#endif
  Argv0 = argv[0];

  struct callback_data data;
  const char *zInitFile = 0;
  char *zFirstCmd = 0;
  int i;
  int rc = 0;
  int warnInmemoryDb = 0;

#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);
    exit(1);
  }
#endif
  Argv0 = argv[0];