diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-03-23 15:48:39 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-03-23 14:48:39 +0100 |
| commit | aefa7ebf0ff0f73feee7ab24f4cdcb2014d83ee5 (patch) | |
| tree | 39560da26771d1e10add697e558bb727639fdbb0 /Modules/_sqlite | |
| parent | 1e2147b9d75a64df370a9393c2b5b9d170dc0afd (diff) | |
| download | cpython-git-aefa7ebf0ff0f73feee7ab24f4cdcb2014d83ee5.tar.gz | |
bpo-6532: Make the thread id an unsigned integer. (#781)
* bpo-6532: Make the thread id an unsigned integer.
From C API side the type of results of PyThread_start_new_thread() and
PyThread_get_thread_ident(), the id parameter of
PyThreadState_SetAsyncExc(), and the thread_id field of PyThreadState
changed from "long" to "unsigned long".
* Restore a check in thread_get_ident().
Diffstat (limited to 'Modules/_sqlite')
| -rw-r--r-- | Modules/_sqlite/connection.c | 2 | ||||
| -rw-r--r-- | Modules/_sqlite/connection.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 774399933e..72156b91a4 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -1125,7 +1125,7 @@ int pysqlite_check_thread(pysqlite_Connection* self) if (PyThread_get_thread_ident() != self->thread_ident) { PyErr_Format(pysqlite_ProgrammingError, "SQLite objects created in a thread can only be used in that same thread." - "The object was created in thread id %ld and this is thread id %ld", + "The object was created in thread id %lu and this is thread id %lu", self->thread_ident, PyThread_get_thread_ident()); return 0; } diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index 2860a0c6f9..5fb410a62e 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -61,7 +61,7 @@ typedef struct int initialized; /* thread identification of the thread the connection was created in */ - long thread_ident; + unsigned long thread_ident; pysqlite_Cache* statement_cache; |