Fossil SCM
Cherrypick SQLite [http://www.sqlite.org/src/info/1e131094b5|1e131094b5]: For the Win32 VFS, defining winShmMutexHeld should be controlled by NDEBUG, not SQLITE_DEBUG
Commit
4699f8d9191a8cb55d32d95af85d0afcb4d2fafb
Parent
242e0b81c95b96f…
1 file changed
+1
-1
+1
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -34186,11 +34186,11 @@ | ||
| 34186 | 34186 | sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34187 | 34187 | } |
| 34188 | 34188 | static void winShmLeaveMutex(void){ |
| 34189 | 34189 | sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34190 | 34190 | } |
| 34191 | -#ifdef SQLITE_DEBUG | |
| 34191 | +#ifndef NDEBUG | |
| 34192 | 34192 | static int winShmMutexHeld(void) { |
| 34193 | 34193 | return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34194 | 34194 | } |
| 34195 | 34195 | #endif |
| 34196 | 34196 | |
| 34197 | 34197 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -34186,11 +34186,11 @@ | |
| 34186 | sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34187 | } |
| 34188 | static void winShmLeaveMutex(void){ |
| 34189 | sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34190 | } |
| 34191 | #ifdef SQLITE_DEBUG |
| 34192 | static int winShmMutexHeld(void) { |
| 34193 | return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34194 | } |
| 34195 | #endif |
| 34196 | |
| 34197 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -34186,11 +34186,11 @@ | |
| 34186 | sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34187 | } |
| 34188 | static void winShmLeaveMutex(void){ |
| 34189 | sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34190 | } |
| 34191 | #ifndef NDEBUG |
| 34192 | static int winShmMutexHeld(void) { |
| 34193 | return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); |
| 34194 | } |
| 34195 | #endif |
| 34196 | |
| 34197 |