/ Check-in [2e66e414]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Fix #if's in winSync to avoid compiler warnings about unused local variables. Also, update version numbers in the MSVC makefile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2e66e41457422449ac5918b16be443e737dfb149
User & Date: mistachkin 2011-09-16 20:43:44
Context
2011-09-16
22:10
Fix a problem with SQLITE_OMIT_TRACE that was introduced by the recent OP_Once change. check-in: 96be3f7b user: drh tags: trunk
20:43
Fix #if's in winSync to avoid compiler warnings about unused local variables. Also, update version numbers in the MSVC makefile. check-in: 2e66e414 user: mistachkin tags: trunk
20:16
Silence harmless compiler warning about redefinition of the _CRT_SECURE_NO_WARNINGS macro by shell.c. check-in: 69022071 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    27     27   # 5 == SQLITE_ENABLE_IOTRACE: Enables output from the IOTRACE() macros.
    28     28   #
    29     29   DEBUG = 0
    30     30   
    31     31   # Version numbers and release number for the SQLite being compiled.
    32     32   #
    33     33   VERSION = 3.7
    34         -VERSION_NUMBER = 3007007
    35         -RELEASE = 3.7.7
           34  +VERSION_NUMBER = 3007008
           35  +RELEASE = 3.7.8
    36     36   
    37     37   # C Compiler and options for use in building executables that
    38     38   # will run on the platform that is doing the build.
    39     39   #
    40     40   BCC = cl.exe
    41     41   
    42     42   # C Compile and options for use in building executables that

Changes to src/os_win.c.

  1241   1241   int sqlite3_fullsync_count = 0;
  1242   1242   #endif
  1243   1243   
  1244   1244   /*
  1245   1245   ** Make sure all writes to a particular file are committed to disk.
  1246   1246   */
  1247   1247   static int winSync(sqlite3_file *id, int flags){
  1248         -#if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || defined(SQLITE_DEBUG)
  1249         -  winFile *pFile = (winFile*)id;
         1248  +#ifndef SQLITE_NO_SYNC
         1249  +  /*
         1250  +  ** Used only when SQLITE_NO_SYNC is not defined.
         1251  +   */
  1250   1252     BOOL rc;
         1253  +#endif
         1254  +#if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || \
         1255  +    (defined(SQLITE_TEST) && defined(SQLITE_DEBUG))
         1256  +  /*
         1257  +  ** Used when SQLITE_NO_SYNC is not defined and by the assert() and/or
         1258  +  ** OSTRACE() macros.
         1259  +   */
         1260  +  winFile *pFile = (winFile*)id;
  1251   1261   #else
  1252   1262     UNUSED_PARAMETER(id);
  1253   1263   #endif
  1254   1264   
  1255   1265     assert( pFile );
  1256   1266     /* Check that one of SQLITE_SYNC_NORMAL or FULL was passed */
  1257   1267     assert((flags&0x0F)==SQLITE_SYNC_NORMAL