diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/stat.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/types.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel_stat.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/types.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/xstatconv.c | 4 |
6 files changed, 20 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index d07bf3b3e5..6781b1ea7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1999-02-10 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/kernel_stat.h: Define _NO_LFS___PAD1. + * sysdeps/unix/sysv/linux/xstatconv.c (xstat64_conv): Don't initialize + __pad1 if _NO_LFS___PAD1 is defined. + * sysdeps/unix/sysv/linux/bits/stat.h: Remove __pad1 from stat64 + definition. + * sysdeps/unix/sysv/linux/bits/types.h: Change __ino64_t to 64 bits. + * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. + 1999-02-09 Ulrich Drepper <drepper@cygnus.com> * po/el.po: Update from translation team. diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h index c175668a06..ff7ffcf2ee 100644 --- a/sysdeps/unix/sysv/linux/bits/stat.h +++ b/sysdeps/unix/sysv/linux/bits/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992, 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 @@ -36,8 +36,8 @@ struct stat { __dev_t st_dev; /* Device. */ - unsigned short int __pad1; #ifndef __USE_FILE_OFFSET64 + unsigned short int __pad1; __ino_t st_ino; /* File serial number. */ #else __ino64_t st_ino; /* File serial number. */ @@ -74,8 +74,6 @@ struct stat struct stat64 { __dev_t st_dev; /* Device. */ - unsigned short int __pad1; - __ino64_t st_ino; /* File serial number. */ __mode_t st_mode; /* File mode. */ __nlink_t st_nlink; /* Link count. */ diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index 44d610efb7..3ec74becbc 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/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 @@ -103,7 +103,7 @@ typedef struct from the global namespace. */ #ifdef __USE_XOPEN __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS]; -# define __FDS_BITS(set) ((set)->fds_bits) +# define __FDS_BITS(set) ((set)->fds_bits) #else __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS]; # define __FDS_BITS(set) ((set)->__fds_bits) @@ -132,7 +132,7 @@ typedef __u_long __fsfilcnt_t; typedef __u_quad_t __fsfilcnt64_t; /* Type of file serial numbers. */ -typedef __u_long __ino64_t; +typedef __u_quad_t __ino64_t; /* Type of file sizes and offsets. */ typedef __loff_t __off64_t; diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index bd7ddcc9bc..9db15616cc 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -4,6 +4,7 @@ struct kernel_stat unsigned short int st_dev; unsigned short int __pad1; #define _HAVE___PAD1 +#define _NO_LFS___PAD1 unsigned long int st_ino; unsigned short int st_mode; unsigned short int st_nlink; diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index 36a1e0e0e3..9828066178 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/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 @@ -132,7 +132,7 @@ typedef __u_long __fsfilcnt_t; typedef __u_quad_t __fsfilcnt64_t; /* Type of file serial numbers. */ -typedef __u_long __ino64_t; +typedef __u_quad_t __ino64_t; /* Type of file sizes and offsets. */ typedef __loff_t __off64_t; diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index 0a8e0c47f9..0f841edcd6 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -1,5 +1,5 @@ /* Convert between the kernel's `struct stat' format, and libc's. - Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 1995, 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 @@ -96,7 +96,7 @@ xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf) /* Convert to current kernel version of `struct stat64'. */ buf->st_dev = kbuf->st_dev; -#ifdef _HAVE___PAD1 +#if defined _HAVE___PAD1 && !defined _NO_LFS___PAD1 buf->__pad1 = 0; #endif buf->st_ino = kbuf->st_ino; |