diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-03-14 21:14:53 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-03-14 21:14:53 -0400 |
| commit | eba3adb8c547317bb259a27be2dc6b0af2f467af (patch) | |
| tree | 2fd1b6de9a90d37d2c473ad5ef9df7fe0cbdb70e /Python/thread_pthread.h | |
| parent | 645f312bebd576c855073c4ecc06a0673614f227 (diff) | |
| parent | 36d507533d39b10591431beb91102e5da812d07b (diff) | |
| download | cpython-eba3adb8c547317bb259a27be2dc6b0af2f467af.tar.gz | |
Merge long Japanese header fix from 3.2.
Diffstat (limited to 'Python/thread_pthread.h')
| -rw-r--r-- | Python/thread_pthread.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index ffc791c578..7d36b920b5 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -228,8 +228,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) @@ -237,13 +236,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 |