diff options
| author | drh <drh@noemail.net> | 2014-10-14 13:41:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-10-14 13:41:32 +0000 |
| commit | 92fe38ece56c01929b8ad949c94a8b7732db496c (patch) | |
| tree | 14273daa821b50e1da797883ca36de3a78329512 /src/threads.c | |
| parent | 78aad7cd1d026afa649460cf0ed6508c3d88a16e (diff) | |
| parent | 8dd8362d6446e8d83fd621122987f048216197c2 (diff) | |
| download | sqlite-92fe38ece56c01929b8ad949c94a8b7732db496c.tar.gz sqlite-92fe38ece56c01929b8ad949c94a8b7732db496c.zip | |
Merge recent trunk micro-optimizations and the DESC index GROUP BY ORDER BY
bug fix into the sessions branch.
FossilOrigin-Name: 83d4114f2aa404e670ced33511183baacd813a01
Diffstat (limited to 'src/threads.c')
| -rw-r--r-- | src/threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/threads.c b/src/threads.c index 213a129c9..6d39042fd 100644 --- a/src/threads.c +++ b/src/threads.c @@ -105,7 +105,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ /* A running thread */ struct SQLiteThread { - uintptr_t tid; /* The thread handle */ + void *tid; /* The thread handle */ unsigned id; /* The thread identifier */ void *(*xTask)(void*); /* The routine to run as a thread */ void *pIn; /* Argument to xTask */ @@ -153,7 +153,7 @@ int sqlite3ThreadCreate( }else{ p->xTask = xTask; p->pIn = pIn; - p->tid = _beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id); + p->tid = (void*)_beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id); if( p->tid==0 ){ memset(p, 0, sizeof(*p)); } |