From a032a6587011cbdac8c2f7e11f15dc4e592bbb55 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Tue, 16 Feb 2010 12:27:18 -0800 Subject: mass sync with glibc nptl Signed-off-by: Austin Foxley --- libpthread/nptl/pthread_tryjoin.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libpthread/nptl/pthread_tryjoin.c') diff --git a/libpthread/nptl/pthread_tryjoin.c b/libpthread/nptl/pthread_tryjoin.c index 049cb5e0a..5746a9e9b 100644 --- a/libpthread/nptl/pthread_tryjoin.c +++ b/libpthread/nptl/pthread_tryjoin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -20,12 +20,14 @@ #include #include -#include "atomic.h" +#include #include "pthreadP.h" int -pthread_tryjoin_np (pthread_t threadid, void **thread_return) +pthread_tryjoin_np ( + pthread_t threadid, + void **thread_return) { struct pthread *self; struct pthread *pd = (struct pthread *) threadid; -- cgit v1.2.3