diff options
| author | drh <drh@noemail.net> | 2015-04-29 00:35:07 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-04-29 00:35:07 +0000 |
| commit | b4a91a9a8859fc021ec4d3de08eb49a257d62a14 (patch) | |
| tree | 0ff342ec38f3fd7c86c5368864d896de21e7469b /src/os_win.c | |
| parent | 0bdef92dc2836b4809892f766da8d1ea94dd7431 (diff) | |
| parent | 5824d44babc81893534bcc1ded9d512da566f498 (diff) | |
| download | sqlite-b4a91a9a8859fc021ec4d3de08eb49a257d62a14.tar.gz sqlite-b4a91a9a8859fc021ec4d3de08eb49a257d62a14.zip | |
Improved support for OSTRACE on Windows.
FossilOrigin-Name: ca43812bde499a23244e2860d3ceddc97d29f09e
Diffstat (limited to 'src/os_win.c')
| -rw-r--r-- | src/os_win.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os_win.c b/src/os_win.c index ef2f553f3..3a8c4cbdb 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2757,7 +2757,7 @@ static int winSync(sqlite3_file *id, int flags){ BOOL rc; #endif #if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || \ - (defined(SQLITE_TEST) && defined(SQLITE_DEBUG)) + defined(SQLITE_HAVE_OS_TRACE) /* ** Used when SQLITE_NO_SYNC is not defined and by the assert() and/or ** OSTRACE() macros. @@ -3434,7 +3434,7 @@ struct winShmNode { int nRef; /* Number of winShm objects pointing to this */ winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ -#ifdef SQLITE_DEBUG +#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ #endif }; @@ -3465,7 +3465,7 @@ struct winShm { u8 hasMutex; /* True if holding the winShmNode mutex */ u16 sharedMask; /* Mask of shared locks held */ u16 exclMask; /* Mask of exclusive locks held */ -#ifdef SQLITE_DEBUG +#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 id; /* Id of this connection with its winShmNode */ #endif }; @@ -3656,7 +3656,7 @@ static int winOpenSharedMemory(winFile *pDbFd){ /* Make the new connection a child of the winShmNode */ p->pShmNode = pShmNode; -#ifdef SQLITE_DEBUG +#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) p->id = pShmNode->nextShmId++; #endif pShmNode->nRef++; |