From dd4f211573cfbed669f582673e8914a1f7038cd9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Aug 2002 22:37:20 +0000 Subject: Update. 2002-08-28 Jakub Jelinek * sysdeps/ia64/elf/configure.in (PI_STATIC_AND_HIDDEN): Define unconditionally. * sysdeps/alpha/elf/configure.in (libc_cv_alpha_hidden_gprel): New check. (PI_STATIC_AND_HIDDEN): Define if check succeeded. 2002-08-28 Jakub Jelinek * locale/loadarchive.c (_nl_load_locale_from_archive): Add fd >= 0 check to close_and_out close. Replace return NULL statements where fd might be >= 0 with goto close_and_out. Close the file descriptor when it is no longer needed. --- linuxthreads/sysdeps/pthread/timer_routines.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'linuxthreads/sysdeps/pthread') diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c index 110448c769..86fae2af4c 100644 --- a/linuxthreads/sysdeps/pthread/timer_routines.c +++ b/linuxthreads/sysdeps/pthread/timer_routines.c @@ -369,7 +369,7 @@ thread_expire_timer (struct thread_node *self, struct timer_node *timer) function is to wait on the thread's timer queue and expire the timers in chronological order as close to their scheduled time as possible. */ -static void * +static void __attribute__ ((noreturn)) thread_func (void *arg) { @@ -449,9 +449,6 @@ thread_func (void *arg) /* This macro will never be executed since the while loop loops forever - but we have to add it for proper nesting. */ pthread_cleanup_pop (1); - - /* NOTREACHED */ - return NULL; } @@ -492,7 +489,8 @@ __timer_thread_start (struct thread_node *thread) assert (!thread->exists); thread->exists = 1; - if (pthread_create (&thread->id, &thread->attr, thread_func, thread) != 0) + if (pthread_create (&thread->id, &thread->attr, + (void (*) (void *)) thread_func, thread) != 0) { thread->exists = 0; retval = -1; -- cgit 1.4.1