summaryrefslogtreecommitdiff
path: root/Python/thread_pthread.h
diff options
context:
space:
mode:
authorguido <guido@google.com>2011-03-29 12:02:49 -0700
committerguido <guido@google.com>2011-03-29 12:02:49 -0700
commitcea1c1161964fc314a0e3dd68e74ceb563fc528c (patch)
tree89c6f150cb5aec505ea2e0e3df746f50b3e85050 /Python/thread_pthread.h
parent7e603d1d2989bfb010d3641a3e152df13e0afbb0 (diff)
parentdff28659880a2ce62ef2c87dc7de58aaa86b85fc (diff)
downloadcpython-cea1c1161964fc314a0e3dd68e74ceb563fc528c.tar.gz
Merge Issue 11662 from 3.2 branch.
Diffstat (limited to 'Python/thread_pthread.h')
-rw-r--r--Python/thread_pthread.h8
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