summaryrefslogtreecommitdiff
path: root/nptl/tst-mutex3.c
diff options
context:
space:
mode:
Diffstat (limited to 'nptl/tst-mutex3.c')
-rw-r--r--nptl/tst-mutex3.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/nptl/tst-mutex3.c b/nptl/tst-mutex3.c
index 2848096538..8e57924ba6 100644
--- a/nptl/tst-mutex3.c
+++ b/nptl/tst-mutex3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -113,25 +113,8 @@ do_test (void)
return 1;
}
-#ifdef ENABLE_PI
- if (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT) != 0)
+ if (pthread_mutex_init (&m, &a) != 0)
{
- puts ("pthread_mutexattr_setprotocol failed");
- return 1;
- }
-#endif
-
- int e;
- e = pthread_mutex_init (&m, &a);
- if (e != 0)
- {
-#ifdef ENABLE_PI
- if (e == ENOTSUP)
- {
- puts ("PI mutexes unsupported");
- return 0;
- }
-#endif
puts ("mutex_init failed");
return 1;
}
@@ -179,7 +162,7 @@ do_test (void)
return 1;
}
- e = pthread_barrier_wait (&b);
+ int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("barrier_wait failed");