From dff8712f9e6e1998564fb828021902a37a3fcf36 Mon Sep 17 00:00:00 2001 From: hobbs Date: Tue, 29 May 2007 23:35:46 +0000 Subject: * unix/tclUnixThrd.c (Tcl_JoinThread): fix for 64-bit handling of pthread_join exit return code storage. [Bug 1712723] --- ChangeLog | 5 +++++ unix/tclUnixThrd.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 080c500..47365c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-29 Jeff Hobbs + + * unix/tclUnixThrd.c (Tcl_JoinThread): fix for 64-bit handling of + pthread_join exit return code storage. [Bug 1712723] + 2007-05-24 Don Porter *** 8.4.15 TAGGED FOR RELEASE *** diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index b95e8f7..b74419b 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -165,8 +165,12 @@ Tcl_JoinThread(threadId, state) { #ifdef TCL_THREADS int result; + unsigned long retcode; - result = pthread_join ((pthread_t) threadId, (VOID**) state); + result = pthread_join((pthread_t) threadId, (void**) &retcode); + if (state) { + *state = (int) retcode; + } return (result == 0) ? TCL_OK : TCL_ERROR; #else return TCL_ERROR; -- cgit v0.12