From beac809a9b59c88e8ea7a7774ec0fb36d3995ea6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Sep 2001 21:30:11 +0000 Subject: Update. 2001-09-12 Jakub Jelinek * rt/Makefile (LDFLAGS-rt.so): Use shared thread library as librt's filter. * elf/dl-close.c (_dl_close): Don't free l_libname if it is not --- linuxthreads/sysdeps/pthread/timer_delete.c | 4 ++-- linuxthreads/sysdeps/pthread/timer_settime.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'linuxthreads/sysdeps') diff --git a/linuxthreads/sysdeps/pthread/timer_delete.c b/linuxthreads/sysdeps/pthread/timer_delete.c index b7d59fe68d..24f4ffed3c 100644 --- a/linuxthreads/sysdeps/pthread/timer_delete.c +++ b/linuxthreads/sysdeps/pthread/timer_delete.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Kaz Kylheku . @@ -41,7 +41,7 @@ timer_delete (timerid) __set_errno (EINVAL); else { - if (timer->armed) + if (timer->armed && timer->thread != NULL) { struct thread_node *thread = timer->thread; assert (thread != NULL); diff --git a/linuxthreads/sysdeps/pthread/timer_settime.c b/linuxthreads/sysdeps/pthread/timer_settime.c index e6c35b4fcf..2f187fd18e 100644 --- a/linuxthreads/sysdeps/pthread/timer_settime.c +++ b/linuxthreads/sysdeps/pthread/timer_settime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Kaz Kylheku . @@ -118,7 +118,8 @@ timer_settime (timerid, flags, value, ovalue) /* Only need to wake up the thread if timer is inserted at the head of the queue. */ - need_wakeup = __timer_thread_queue_timer (thread, timer); + if (thread != NULL) + need_wakeup = __timer_thread_queue_timer (thread, timer); timer->armed = 1; } -- cgit v1.2.3