1 files changed, 5 insertions, 5 deletions

diff --git a/winsup/testsuite/winsup.api/pthread/cleanup2.c b/winsup/testsuite/winsup.api/pthread/cleanup2.c
index bcbaad3a7..75c239a00 100644
--- a/winsup/testsuite/winsup.api/pthread/cleanup2.c
+++ b/winsup/testsuite/winsup.api/pthread/cleanup2.c
@@ -84,7 +84,7 @@ mythread(void * arg)
 
   pthread_cleanup_pop(1);
 
-  return (void *) result;
+  return (void *) (size_t) result;
 }
 
 int
@@ -129,18 +129,18 @@ main()
   for (i = 1; i <= NUMTHREADS; i++)
     {
       int fail = 0;
-      int result = 0;
+      void* result = 0;
 
-      assert(pthread_join(t[i], (void **) &result) == 0);
+      assert(pthread_join(t[i], &result) == 0);
 
-      fail = (result != 0);
+      fail = ((int)(size_t)result != 0);
 
       if (fail)
 	{
 	  fprintf(stderr, "Thread %d: started %d: result: %d\n",
 		  i,
 		  threadbag[i].started,
-		  result);
+		  (int)(size_t)result);
 	}
       failed = (failed || fail);
     }