summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/bits
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-14 06:17:28 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-14 06:17:28 +0000
commit47b853e80188cd79fe0a6b444ed35be7ad3448ed (patch)
tree271a3e2afd8e4284256324f417530bda6af2d1fc /sysdeps/unix/sysv/linux/bits
parent91bc38d09ce2df68d5f03e88df144243907437da (diff)
downloadglibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.tar.gz
glibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.tar.xz
glibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.zip
Update.
2000-08-13  Ulrich Drepper  <drepper@redhat.com>

	* posix/Makefile: Remove rules to generate glob package.

	* posix/Makefile (tests): Add tst-regexloc.
	(tst-regexloc-ENV): Add LOCPATH.
	* posix/tst-regexloc.c: New file.
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits')
-rw-r--r--sysdeps/unix/sysv/linux/bits/time.h8
-rw-r--r--sysdeps/unix/sysv/linux/bits/types.h7
2 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index d827193146..c5ff93035a 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Linux 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
@@ -39,12 +39,6 @@
 #   define CLK_TCK 100
 #  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/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h
index a45b452534..d96ee32cf0 100644
--- a/sysdeps/unix/sysv/linux/bits/types.h
+++ b/sysdeps/unix/sysv/linux/bits/types.h
@@ -87,6 +87,13 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 
 typedef long int __clock_t;
 
+/* 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;