summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2014-05-29 00:03:00 (GMT)
committerJason Evans <jasone@canonware.com>2014-06-02 03:50:24 (GMT)
commit999e1b5cc74e299a25cc718ddf9fae370cf45264 (patch)
tree8ebf1ab13e2256860fef5f051edcab85acff8b4a
parent1f6d77e1f687c3c4fa4ae6768b689a7936923f07 (diff)
downloadjemalloc-999e1b5cc74e299a25cc718ddf9fae370cf45264.zip
jemalloc-999e1b5cc74e299a25cc718ddf9fae370cf45264.tar.gz
jemalloc-999e1b5cc74e299a25cc718ddf9fae370cf45264.tar.bz2
Fix thd_join on win64
-rw-r--r--test/src/thd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/src/thd.c b/test/src/thd.c
index 7e53625..c9d0065 100644
--- a/test/src/thd.c
+++ b/test/src/thd.c
@@ -14,8 +14,11 @@ void
thd_join(thd_t thd, void **ret)
{
- if (WaitForSingleObject(thd, INFINITE) == WAIT_OBJECT_0 && ret)
- GetExitCodeThread(thd, (LPDWORD) ret);
+ if (WaitForSingleObject(thd, INFINITE) == WAIT_OBJECT_0 && ret) {
+ DWORD exit_code;
+ GetExitCodeThread(thd, (LPDWORD) &exit_code);
+ *ret = (void *)(uintptr_t)exit_code;
+ }
}
#else