From 57fb9b3868f8a0977ef736a535432c43fef7b6a8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 17 Jul 1999 23:20:43 +0000 Subject: [PATCH] Update. * sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise * sysdeps/generic/bits/time.h: Likewise. * sysdeps/mach/hurd/bits/time.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. * sysdeps/generic/bits/types.h: Likewise. * posix/sys/types.h: Define suseconds_t for X/Open. --- ChangeLog | 6 ++++++ bits/time.h | 4 ++-- bits/types.h | 3 ++- posix/sys/types.h | 4 ++++ sysdeps/generic/bits/time.h | 4 ++-- sysdeps/generic/bits/types.h | 3 ++- sysdeps/mach/hurd/bits/time.h | 2 +- sysdeps/unix/sysv/linux/alpha/bits/time.h | 6 +++--- sysdeps/unix/sysv/linux/alpha/bits/types.h | 1 + sysdeps/unix/sysv/linux/bits/time.h | 8 ++++---- sysdeps/unix/sysv/linux/bits/types.h | 1 + sysdeps/unix/sysv/linux/mips/bits/types.h | 1 + sysdeps/unix/sysv/linux/sparc/bits/types.h | 1 + sysdeps/unix/sysv/sysv4/solaris2/bits/types.h | 3 ++- 14 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54a57b6d56..cd99f577d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,16 @@ * sysdeps/unix/sysv/linux/bits/time.h (timeval): Use __suseconds_t type for tv_usec element. + * sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise * sysdeps/unix/sysv/linux/bits/types.h: Define __suseconds_t. + * sysdeps/generic/bits/time.h: Likewise. + * sysdeps/mach/hurd/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise. + * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. + * sysdeps/generic/bits/types.h: Likewise. + * posix/sys/types.h: Define suseconds_t for X/Open. 1999-07-15 Ulrich Drepper diff --git a/bits/time.h b/bits/time.h index f608e2c996..0f202c0a67 100644 --- a/bits/time.h +++ b/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Stub version. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 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 @@ -40,7 +40,7 @@ struct timeval { __time_t tv_sec; /* Seconds. */ - __time_t tv_usec; /* Microseconds. */ + __suseconds_t tv_usec; /* Microseconds. */ }; # endif /* struct timeval */ #endif /* need timeval */ diff --git a/bits/types.h b/bits/types.h index e34ad727a9..ecf86cef95 100644 --- a/bits/types.h +++ b/bits/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,99 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 @@ -80,6 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __key_t; /* Type of an IPC key */ diff --git a/posix/sys/types.h b/posix/sys/types.h index 61d46f27dc..be37340025 100644 --- a/posix/sys/types.h +++ b/posix/sys/types.h @@ -120,6 +120,10 @@ typedef __key_t key_t; #define __need_time_t #include +#ifdef __USE_XOPEN +typedef __suseconds_t suseconds_t; +#endif + #define __need_size_t #include diff --git a/sysdeps/generic/bits/time.h b/sysdeps/generic/bits/time.h index f608e2c996..0f202c0a67 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 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 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 @@ -40,7 +40,7 @@ struct timeval { __time_t tv_sec; /* Seconds. */ - __time_t tv_usec; /* Microseconds. */ + __suseconds_t tv_usec; /* Microseconds. */ }; # endif /* struct timeval */ #endif /* need timeval */ diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index e34ad727a9..ecf86cef95 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 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,99 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 @@ -80,6 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __key_t; /* Type of an IPC key */ diff --git a/sysdeps/mach/hurd/bits/time.h b/sysdeps/mach/hurd/bits/time.h index 14c7146243..2305704ba9 100644 --- a/sysdeps/mach/hurd/bits/time.h +++ b/sysdeps/mach/hurd/bits/time.h @@ -56,7 +56,7 @@ extern int __libc_clk_tck __P ((void)) __attribute__ ((const)); struct timeval { __time_t tv_sec; /* Seconds. */ - __time_t tv_usec; /* Microseconds. */ + __suseconds_t tv_usec; /* Microseconds. */ }; # endif /* struct timeval */ #endif /* need timeval */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/time.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h index f44b5dcabc..aeb03b6341 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/time.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Linux/Alpha version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 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 @@ -42,7 +42,7 @@ # endif /* bits/time.h */ #endif /* !__need_timeval */ -#ifdef __need_timeval +#ifdef __need_timeval # undef __need_timeval # ifndef _STRUCT_TIMEVAL # define _STRUCT_TIMEVAL 1 @@ -53,7 +53,7 @@ struct timeval { __time_t tv_sec; /* Seconds. */ - __time_t tv_usec; /* Microseconds. */ + __suseconds_t tv_usec; /* Microseconds. */ }; # endif /* struct timeval */ #endif /* need timeval */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 0af9fb399d..91b49a2fcc 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -76,6 +76,7 @@ typedef struct typedef int __daddr_t; /* Type of a disk address. */ typedef char *__caddr_t; /* Type of a core address. */ typedef long int __time_t; +typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; typedef int __key_t; /* Type of a SYSV IPC key. */ diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h index 274d616777..4b7ef52b7a 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 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 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 @@ -42,7 +42,7 @@ # endif /* bits/time.h */ #endif -#ifdef __need_timeval +#ifdef __need_timeval # undef __need_timeval # ifndef _STRUCT_TIMEVAL # define _STRUCT_TIMEVAL 1 @@ -53,7 +53,7 @@ struct timeval { __time_t tv_sec; /* Seconds. */ - __time_t tv_usec; /* Microseconds. */ + __suseconds_t tv_usec; /* Microseconds. */ }; # endif /* struct timeval */ -#endif /* need timeval */ +#endif /* need timeval */ diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index ccab7fb07c..a33b0369ca 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/bits/types.h @@ -81,6 +81,7 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index 51d9fcdc06..4b63cf82f4 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types.h @@ -81,6 +81,7 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types.h b/sysdeps/unix/sysv/linux/sparc/bits/types.h index 9423015538..49aa375d4b 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/types.h @@ -98,6 +98,7 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h index 8c4a13ada9..b2eace3f54 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,99 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 @@ -79,6 +79,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef int __key_t; /* Type of an IPC key */