From 2c6497200622cb3f9551f0c8120c2d3535f2a25d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 12 Aug 2001 22:02:53 +0000 Subject: [PATCH] * hurd/hurdlookup.c (__hurd_file_name_lookup): Comment fix. * sysdeps/mach/hurd/bits/time.h (CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID): New macros. * sysdeps/mach/hurd/i386/bits/time.h: File removed. --- ChangeLog | 8 +++++ sysdeps/mach/hurd/bits/time.h | 8 +++-- sysdeps/mach/hurd/i386/bits/time.h | 72 -------------------------------------- 3 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 sysdeps/mach/hurd/i386/bits/time.h diff --git a/ChangeLog b/ChangeLog index dcfb2ba..ea9bf11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ +2001-08-12 Roland McGrath + + * hurd/hurdlookup.c (__hurd_file_name_lookup): Comment fix. + 2001-08-11 Roland McGrath + * sysdeps/mach/hurd/bits/time.h + (CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID): New macros. + * sysdeps/mach/hurd/i386/bits/time.h: File removed. + * posix/getopt.c (nonoption_flags_max_len, nonoption_flags_len): Make these defns conditional on [USE_NONOPTION_FLAGS]. diff --git a/sysdeps/mach/hurd/bits/time.h b/sysdeps/mach/hurd/bits/time.h index 73574b7..58c1eaf 100644 --- a/sysdeps/mach/hurd/bits/time.h +++ b/sysdeps/mach/hurd/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Hurd version. - Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996,97,99,2000,01 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 @@ -43,7 +43,11 @@ extern long int __sysconf (int); # ifdef __USE_POSIX199309 /* Identifier for system-wide realtime clock. */ -# define CLOCK_REALTIME 0 +# define CLOCK_REALTIME 0 +/* High-resolution timer from the CPU. */ +# define CLOCK_PROCESS_CPUTIME_ID 2 +/* Thread-specific CPU-time clock. */ +# define CLOCK_THREAD_CPUTIME_ID 3 /* Flag to indicate time is absolute. */ # define TIMER_ABSTIME 1 diff --git a/sysdeps/mach/hurd/i386/bits/time.h b/sysdeps/mach/hurd/i386/bits/time.h deleted file mode 100644 index af6b9fe..0000000 --- a/sysdeps/mach/hurd/i386/bits/time.h +++ /dev/null @@ -1,72 +0,0 @@ -/* System-dependent timing definitions. i386/Hurd version. - Copyright (C) 1996, 1997, 1999, 2000, 2001 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* - * Never include this file directly; use instead. - */ - -#ifndef __need_timeval -# ifndef _BITS_TIME_H -# define _BITS_TIME_H 1 - -/* ISO/IEC 9899:1990 7.12.1: - The macro `CLOCKS_PER_SEC' is the number per second of the value - returned by the `clock' function. */ -/* CAE XSH, Issue 4, Version 2: - The value of CLOCKS_PER_SEC is required to be 1 million on all - XSI-conformant systems. */ -# define CLOCKS_PER_SEC 1000000l - -# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K -/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK - presents the real value for clock ticks per second for the system. */ -# include -extern long int __sysconf (int); -# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */ -# endif - -# ifdef __USE_POSIX199309 -/* Identifier for system-wide realtime clock. */ -# define CLOCK_REALTIME 0 -/* High-resolution timer from the CPU. */ -# define __CLOCK_HIGHRES 1 - -/* Flag to indicate time is absolute. */ -# define TIMER_ABSTIME 1 -# endif - -# endif /* bits/time.h */ -#endif - - -#ifdef __need_timeval -# undef __need_timeval -# ifndef _STRUCT_TIMEVAL -# define _STRUCT_TIMEVAL 1 -# include - -/* A time value that is accurate to the nearest - microsecond but also has a range of years. */ -struct timeval - { - __time_t tv_sec; /* Seconds. */ - __suseconds_t tv_usec; /* Microseconds. */ - }; -# endif /* struct timeval */ -#endif /* need timeval */ -- 2.7.4