From 6340ea91d4ea610aa8525903a75c67d95c3158a3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Sep 2000 21:41:10 +0000 Subject: Update. 2000-09-13 Ulrich Drepper * time/time.h: Don't defined clockid_t and timer_t unless POSIX definitions are requested. --- ChangeLog | 5 +++++ time/time.h | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b2a0e9ec9..c4114f8d77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-13 Ulrich Drepper + + * time/time.h: Don't defined clockid_t and timer_t unless POSIX + definitions are requested. + 2000-09-13 Andreas Jaeger * shlib-versions: libBrokenLocale needs minimal version for ia64, diff --git a/time/time.h b/time/time.h index edf34fb7e1..b2472738ff 100644 --- a/time/time.h +++ b/time/time.h @@ -50,7 +50,6 @@ __BEGIN_DECLS #endif /* included. */ - #if !defined __clock_t_defined && (defined _TIME_H || defined __need_clock_t) # define __clock_t_defined 1 @@ -73,7 +72,8 @@ typedef __time_t time_t; #endif /* time_t not defined and or need time_t. */ #undef __need_time_t -#if !defined __clockid_t_defined && (defined _TIME_H || defined __need_clockid_t) +#if !defined __clockid_t_defined && \ + ((defined _TIME_H && defined __USE_POSIX199309) || defined __need_clockid_t) # define __clockid_t_defined 1 # include @@ -84,7 +84,8 @@ typedef __clockid_t clockid_t; #endif /* clockid_t not defined and or need clockid_t. */ #undef __clockid_time_t -#if !defined __timer_t_defined && (defined _TIME_H || defined __need_timer_t) +#if !defined __timer_t_defined && \ + ((defined _TIME_H && defined __USE_POSIX199309) || defined __need_timer_t) # define __timer_t_defined 1 # include -- cgit v1.2.3