/ Check-in [1e131094]
Login

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

Overview
Comment:For the Win32 VFS, defining winShmMutexHeld should be controlled by NDEBUG, not SQLITE_DEBUG.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1e131094b522103a0829f72193b067b04e42ce82
User & Date: mistachkin 2014-01-14 10:17:02
References
2014-01-15
00:24
Merge recent fixes from trunk. Cherrypick of [c43b59dac1], [a221aa82bb], [e1eba1fb09], and [1e131094b5]. check-in: c697d2f8 user: mistachkin tags: branch-3.8.2
Context
2014-01-15
00:24
Merge recent fixes from trunk. Cherrypick of [c43b59dac1], [a221aa82bb], [e1eba1fb09], and [1e131094b5]. check-in: c697d2f8 user: mistachkin tags: branch-3.8.2
2014-01-14
10:17
Fix harmless compiler warning in LEMON. check-in: f61a7058 user: mistachkin tags: trunk
10:17
For the Win32 VFS, defining winShmMutexHeld should be controlled by NDEBUG, not SQLITE_DEBUG. check-in: 1e131094 user: mistachkin tags: trunk
2014-01-13
20:38
In the command-line shell, defend against a NULL-pointer dereference in the case where sqlite3_column_name() returns NULL (as might happen following an OOM error). check-in: ac15455a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  3220   3220   */
  3221   3221   static void winShmEnterMutex(void){
  3222   3222     sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
  3223   3223   }
  3224   3224   static void winShmLeaveMutex(void){
  3225   3225     sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
  3226   3226   }
  3227         -#ifdef SQLITE_DEBUG
         3227  +#ifndef NDEBUG
  3228   3228   static int winShmMutexHeld(void) {
  3229   3229     return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
  3230   3230   }
  3231   3231   #endif
  3232   3232   
  3233   3233   /*
  3234   3234   ** Object used to represent a single file opened and mmapped to provide