From 85dfeaf6133e1b74eefed26cf76c3f8631c7dd1d Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Sat, 5 Mar 2011 07:21:12 +0000
Subject: Rework pthread_join result arg casting

---
 tests/barrier5.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/barrier5.c')

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);
-- 
cgit v1.2.3