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_timedjoin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libpthread/nptl/pthread_timedjoin.c') diff --git a/libpthread/nptl/pthread_timedjoin.c b/libpthread/nptl/pthread_timedjoin.c index ce2cf3f65..4098a7373 100644 --- a/libpthread/nptl/pthread_timedjoin.c +++ b/libpthread/nptl/pthread_timedjoin.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. @@ -19,7 +19,7 @@ #include #include -#include "atomic.h" +#include #include "pthreadP.h" @@ -32,9 +32,9 @@ cleanup (void *arg) int pthread_timedjoin_np ( - pthread_t threadid, - void **thread_return, - const struct timespec *abstime) + pthread_t threadid, + void **thread_return, + const struct timespec *abstime) { struct pthread *self; struct pthread *pd = (struct pthread *) threadid; -- cgit v1.2.3