summaryrefslogtreecommitdiff
path: root/tests/exception1.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/exception1.c')
-rw-r--r--tests/exception1.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/exception1.c b/tests/exception1.c
index eddd8fb..609e5ed 100644
--- a/tests/exception1.c
+++ b/tests/exception1.c
@@ -136,8 +136,8 @@ canceledThread(void * arg)
for (count = 0; count < 100; count++)
Sleep(100);
}
-#if defined(_MSC_VER)
- AltCatchAll
+#if defined(PtW32CatchAll)
+ PtW32CatchAll
#else
catch (...)
#endif
@@ -192,13 +192,13 @@ main()
int result = 0;
/* Canceled thread */
- assert(pthread_join(ct[i], (void *) &result) == 0);
+ assert(pthread_join(ct[i], (void **) &result) == 0);
fail = (result != (int) PTHREAD_CANCELED);
failed = (failed || fail);
/* Exception thread */
- assert(pthread_join(et[i], (void *) &result) == 0);
+ assert(pthread_join(et[i], (void **) &result) == 0);
fail = (result != ((int) PTHREAD_CANCELED + 2));
failed = (failed || fail);