diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-21 01:12:59 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-21 01:12:59 +0200 |
| commit | 0fc80cf7d66bbe14b54bc278be47b88d0d15d996 (patch) | |
| tree | 2bced3752153ebe87c3f78d662c941b4df1df2a5 /Python/thread_pthread.h | |
| parent | 49ef44d6c75a2e07d4ee0b8395c9b253171db1ea (diff) | |
| parent | b0c9e71dba6087fe348f3eae2a83fe8a64c44dc0 (diff) | |
| download | cpython-0fc80cf7d66bbe14b54bc278be47b88d0d15d996.tar.gz | |
Merge 3.2: test_multiprocessing removes temporary files
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 |