diff options
author | rpj <rpj> | 2011-03-05 07:21:12 +0000 |
---|---|---|
committer | rpj <rpj> | 2011-03-05 07:21:12 +0000 |
commit | 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d (patch) | |
tree | 92e0f60e66f36f1ea1ca9cec4617d7f187698ecf /tests/barrier5.c | |
parent | 275d03d3af64e4f5e1769584214f6fccc303456e (diff) |
Rework pthread_join result arg casting
Diffstat (limited to 'tests/barrier5.c')
-rw-r--r-- | tests/barrier5.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/barrier5.c b/tests/barrier5.c index 4510be0..b64b7d7 100644 --- a/tests/barrier5.c +++ b/tests/barrier5.c @@ -72,14 +72,14 @@ func(void * crossings) } } - return (void *) (size_t)serialThreads; + return (void*)(size_t)serialThreads; } int main() { int i, j; - int result; + void* result; int serialThreadsTotal; LONG Crossings; pthread_t t[NUMTHREADS + 1]; @@ -104,7 +104,7 @@ main() for (i = 1; i <= j; i++) { assert(pthread_join(t[i], (void *) &result) == 0); - serialThreadsTotal += result; + serialThreadsTotal += (int)(size_t)result; } assert(serialThreadsTotal == BARRIERMULTIPLE); |