diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-04-15 15:12:37 +0100 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-04-15 15:12:37 +0100 |
| commit | 0276a326e15ced5fe6494d40658e9652ac90c5d5 (patch) | |
| tree | a6b2218dbfd8082a7976f7ae7b22c7e138a201a0 /Python/thread_pthread.h | |
| parent | 4536a907e314836a320414ee5bf3bf7557fef7b6 (diff) | |
| parent | 3cd6793317074f286add6fff3627776fe3a50483 (diff) | |
| download | cpython-0276a326e15ced5fe6494d40658e9652ac90c5d5.tar.gz | |
Issue #13889: Merge fix from 3.2.
Diffstat (limited to 'Python/thread_pthread.h')
| -rw-r--r-- | Python/thread_pthread.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 3cde03567c..4f9e2c19d6 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -148,7 +148,7 @@ typedef struct { * Initialization. */ -#ifdef _HAVE_BSDI +#if defined(_HAVE_BSDI) static void _noop(void) { @@ -244,8 +244,7 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) hosed" because: - It does not guarantee the promise that a non-zero integer is returned. - The cast to long is inherently unsafe. - - It is not clear that the 'volatile' (for AIX?) and ugly casting in the - latter return statement (for Alpha OSF/1) are any longer necessary. + - It is not clear that the 'volatile' (for AIX?) are any longer necessary. */ long PyThread_get_thread_ident(void) @@ -253,13 +252,8 @@ PyThread_get_thread_ident(void) volatile pthread_t threadid; if (!initialized) PyThread_init_thread(); - /* Jump through some hoops for Alpha OSF/1 */ threadid = pthread_self(); -#if SIZEOF_PTHREAD_T <= SIZEOF_LONG return (long) threadid; -#else - return (long) *(long *) &threadid; -#endif } void |