Module Name: src
Committed By: jruoho
Date: Thu Jul 29 12:03:10 UTC 2010
Modified Files:
src/tests/lib/libpthread: t_join.c
Log Message:
Fix build failure on AMD64, noted by nj...@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libpthread/t_join.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libpthread/t_join.c
diff -u src/tests/lib/libpthread/t_join.c:1.1 src/tests/lib/libpthread/t_join.c:1.2
--- src/tests/lib/libpthread/t_join.c:1.1 Wed Jul 28 21:29:15 2010
+++ src/tests/lib/libpthread/t_join.c Thu Jul 29 12:03:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_join.c,v 1.1 2010/07/28 21:29:15 jruoho Exp $ */
+/* $NetBSD: t_join.c,v 1.2 2010/07/29 12:03:10 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_join.c,v 1.1 2010/07/28 21:29:15 jruoho Exp $");
+__RCSID("$NetBSD: t_join.c,v 1.2 2010/07/29 12:03:10 jruoho Exp $");
#include <errno.h>
#include <pthread.h>
@@ -64,7 +64,7 @@
{
pthread_t thread[25];
pthread_t caller;
- void *val = NULL;
+ void *val;
size_t i;
int rv;
@@ -102,11 +102,9 @@
*/
PTHREAD_REQUIRE(pthread_join(thread[i], &val));
+ ATF_REQUIRE(val == NULL);
ATF_REQUIRE_EQ(error, false);
- ATF_REQUIRE(val != NULL);
- ATF_REQUIRE(val == (void *)(i + 1));
-
/*
* Once the thread has returned, ESRCH should
* again follow if we try to join it again.
@@ -139,7 +137,7 @@
if (i++ == j)
error = false;
- pthread_exit((void *)i);
+ pthread_exit(NULL);
return NULL;
}
