diff options
| author | drh <drh@noemail.net> | 2015-09-24 14:26:51 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-09-24 14:26:51 +0000 |
| commit | 9ec0efd946b8015f8b3ba3b726bc39f0b15d306c (patch) | |
| tree | b4764dfa9ca1b2d064f80f3d13056f2b5bbeba61 /src/os_win.c | |
| parent | 438b881540c83370029c73c8a1d7eba78979c491 (diff) | |
| parent | 22c733da644bcf8d614b7caf058c7a2b51286ab8 (diff) | |
| download | sqlite-9ec0efd946b8015f8b3ba3b726bc39f0b15d306c.tar.gz sqlite-9ec0efd946b8015f8b3ba3b726bc39f0b15d306c.zip | |
Merge all the latest trunk enhancements into the sessions branch.
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
Diffstat (limited to 'src/os_win.c')
| -rw-r--r-- | src/os_win.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os_win.c b/src/os_win.c index 41bd94098..251107528 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3850,8 +3850,8 @@ static void winShmBarrier( sqlite3_file *fd /* Database holding the shared memory */ ){ UNUSED_PARAMETER(fd); - /* MemoryBarrier(); // does not work -- do not know why not */ - winShmEnterMutex(); + sqlite3MemoryBarrier(); /* compiler-defined memory barrier */ + winShmEnterMutex(); /* Also mutex, for redundancy */ winShmLeaveMutex(); } |