Update.

2000-09-13  Ulrich Drepper  <drepper@redhat.com>

	* time/time.h: Don't defined clockid_t and timer_t unless POSIX
	definitions are requested.

diff --git a/ChangeLog b/ChangeLog
index 3b2a0e9ec99c901cd974f06698a5eb3ff8a68f31..c4114f8d77897d4b4b354565320153314f33d3a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-13  Ulrich Drepper  <drepper@redhat.com>
+
+       * time/time.h: Don't defined clockid_t and timer_t unless POSIX
+       definitions are requested.
+
 2000-09-13  Andreas Jaeger  <aj@suse.de>
 
        * shlib-versions: libBrokenLocale needs minimal version for ia64,

diff --git a/time/time.h b/time/time.h
index edf34fb7e1ab8b69eb890b52743c90c79f5e53c2..b2472738ff0a26025beb74e866ea6bd8b181602b 100644 (file)
--- a/time/time.h
+++ b/time/time.h
@@ -50,7 +50,6 @@ __BEGIN_DECLS
 
 #endif /* <time.h> 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 <time.h> 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 <bits/types.h>
@@ -84,7 +84,8 @@ typedef __clockid_t clockid_t;
 #endif /* clockid_t not defined and <time.h> 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 <bits/types.h>