diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-11-27 12:50:15 +0100 |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-11-27 12:50:15 +0100 |
| commit | 2e62c03aea1fc45dc2028f43b0cf2284167e3bf3 (patch) | |
| tree | 749012026a7985be01e5e542bb9cd85a35454ccf /Python/thread_pthread.h | |
| parent | ebf9b25e02def456b5f921814e3e1456d827f844 (diff) | |
| parent | bad59cc495132cd01bbf643ba108dc42149a2733 (diff) | |
| download | cpython-2e62c03aea1fc45dc2028f43b0cf2284167e3bf3.tar.gz | |
Null merge.
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 3efccf660a..4b61e18941 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -144,7 +144,7 @@ typedef struct { * Initialization. */ -#ifdef _HAVE_BSDI +#if defined(_HAVE_BSDI) static void _noop(void) { @@ -240,8 +240,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) @@ -249,13 +248,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 |