From e4bb48539fa1012f4ec102d8a3b12e846a832ff5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 4 Oct 2004 20:51:25 +0000 Subject: Update. 2004-10-04 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME and _POSIX_THREAD_CPUTIME to zero. * sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Likewise. * tst-barrier2.c: Fix testing for POSIX feature. * tst-clock1.c: Likewise. * tst-clock2.c: Likewise. * tst-cond11.c: Likewise. * tst-cond4.c: Likewise. * tst-cond6.c: Likewise. * tst-flock2.c: Likewise. * tst-mutex4.c: Likewise. * tst-mutex9.c: Likewise. * tst-rwlock12.c: Likewise. * tst-rwlock4.c: Likewise. * tst-signal1.c: Likewise. * tst-spin2.c: Likewise. * sysdeps/pthread/posix-timer.h: Likewise. * sysdeps/pthread/timer_create.c: Likewise. * sysdeps/pthread/timer_routines.c: Likewise. --- nptl/sysdeps/pthread/timer_routines.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nptl/sysdeps/pthread/timer_routines.c') diff --git a/nptl/sysdeps/pthread/timer_routines.c b/nptl/sysdeps/pthread/timer_routines.c index 3ee8fef17b..caa93433e3 100644 --- a/nptl/sysdeps/pthread/timer_routines.c +++ b/nptl/sysdeps/pthread/timer_routines.c @@ -53,10 +53,10 @@ int __timer_init_failed; /* Node for the thread used to deliver signals. */ struct thread_node __timer_signal_thread_rclk; -#ifdef _POSIX_CPUTIME +#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 struct thread_node __timer_signal_thread_pclk; #endif -#ifdef _POSIX_THREAD_CPUTIME +#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 struct thread_node __timer_signal_thread_tclk; #endif @@ -191,10 +191,10 @@ init_module (void) list_append (&thread_free_list, &thread_array[i].links); thread_init (&__timer_signal_thread_rclk, 0, CLOCK_REALTIME); -#ifdef _POSIX_CPUTIME +#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 thread_init (&__timer_signal_thread_pclk, 0, CLOCK_PROCESS_CPUTIME_ID); #endif -#ifdef _POSIX_THREAD_CPUTIME +#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 thread_init (&__timer_signal_thread_tclk, 0, CLOCK_THREAD_CPUTIME_ID); #endif } @@ -281,10 +281,10 @@ thread_cleanup (void *val) /* How did the signal thread get killed? */ assert (thread != &__timer_signal_thread_rclk); -#ifdef _POSIX_CPUTIME +#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 assert (thread != &__timer_signal_thread_pclk); #endif -#ifdef _POSIX_THREAD_CPUTIME +#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 assert (thread != &__timer_signal_thread_tclk); #endif -- cgit v1.2.3