* sysdeps/mach/hurd/i386/bits/time.h (__clockid_t, __timer_t): Remove typedefs. * sysdeps/mach/hurd/bits/time.h (__clockid_t, __timer_t): Remove typedefs. * sysdeps/generic/bits/time.h (__clockid_t, __timer_t): Remove typedefs. * sysdeps/generic/bits/types.h (__clockid_t, __timer_t): New typedefs.

	* sysdeps/mach/hurd/i386/bits/time.h (__clockid_t, __timer_t):
	Remove typedefs.
	* sysdeps/mach/hurd/bits/time.h (__clockid_t, __timer_t): Remove
	typedefs.
	* sysdeps/generic/bits/time.h (__clockid_t, __timer_t): Remove
	typedefs.
	* sysdeps/generic/bits/types.h (__clockid_t, __timer_t): New typedefs.

2000-08-15  Mark Kettenis  <kettenis@gnu.org>

7 files changed, 28 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index eb774583c1..1567e225e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-08-15  Mark Kettenis  <kettenis@gnu.org>
 
+	* sysdeps/mach/hurd/i386/bits/time.h (__clockid_t, __timer_t):
+	Remove typedefs.
+	* sysdeps/mach/hurd/bits/time.h (__clockid_t, __timer_t): Remove
+	typedefs.
+	* sysdeps/generic/bits/time.h (__clockid_t, __timer_t): Remove
+	typedefs.
+	* sysdeps/generic/bits/types.h (__clockid_t, __timer_t): New typedefs.
+
+2000-08-15  Mark Kettenis  <kettenis@gnu.org>
+
 	* sysdeps/mach/hurd/xstatconv.c: New file.
 	* sysdeps/mach/hurd/fxstat64.c: New file.
 	* sysdeps/mach/hurd/lxstat64.c: New file.
diff --git a/bits/time.h b/bits/time.h
index 6ef97b74e3..0c3f7fd28e 100644
--- a/bits/time.h
+++ b/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Stub version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,12 +27,6 @@
 
 #  define CLOCKS_PER_SEC 60
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0
diff --git a/bits/types.h b/bits/types.h
index a7b736dffc..fd2ec223ea 100644
--- a/bits/types.h
+++ b/bits/types.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -86,6 +86,13 @@ typedef long int __swblk_t;	/* Type of a swap block maybe?  */
 typedef long int __key_t;	/* Type of an IPC key */
 
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;
 
diff --git a/sysdeps/generic/bits/time.h b/sysdeps/generic/bits/time.h
index 6ef97b74e3..0c3f7fd28e 100644
--- a/sysdeps/generic/bits/time.h
+++ b/sysdeps/generic/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Stub version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,12 +27,6 @@
 
 #  define CLOCKS_PER_SEC 60
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0
diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h
index a7b736dffc..fd2ec223ea 100644
--- a/sysdeps/generic/bits/types.h
+++ b/sysdeps/generic/bits/types.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -86,6 +86,13 @@ typedef long int __swblk_t;	/* Type of a swap block maybe?  */
 typedef long int __key_t;	/* Type of an IPC key */
 
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;
 
diff --git a/sysdeps/mach/hurd/bits/time.h b/sysdeps/mach/hurd/bits/time.h
index 55ae998623..183c2fca76 100644
--- a/sysdeps/mach/hurd/bits/time.h
+++ b/sysdeps/mach/hurd/bits/time.h
@@ -41,12 +41,6 @@
 extern int __libc_clk_tck (void) __attribute__ ((__const__));
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0
diff --git a/sysdeps/mach/hurd/i386/bits/time.h b/sysdeps/mach/hurd/i386/bits/time.h
index f113030ae2..360b4166a4 100644
--- a/sysdeps/mach/hurd/i386/bits/time.h
+++ b/sysdeps/mach/hurd/i386/bits/time.h
@@ -41,12 +41,6 @@
 extern int __libc_clk_tck (void) __attribute__ ((__const__));
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0