From 49b75f5ef5da3136e4b4015e23e2fe38aacbc7b3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 11 Feb 1999 12:11:01 +0000 Subject: Update. --- sysdeps/unix/sysv/linux/bits/stat.h | 6 ++++-- sysdeps/unix/sysv/linux/bits/types.h | 4 ++-- sysdeps/unix/sysv/linux/kernel_stat.h | 1 - sysdeps/unix/sysv/linux/mips/bits/types.h | 4 ++-- sysdeps/unix/sysv/linux/xstatconv.c | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h index ff7ffcf2ee..c175668a06 100644 --- a/sysdeps/unix/sysv/linux/bits/stat.h +++ b/sysdeps/unix/sysv/linux/bits/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1996, 1997, 1998 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. */ -#ifndef __USE_FILE_OFFSET64 unsigned short int __pad1; +#ifndef __USE_FILE_OFFSET64 __ino_t st_ino; /* File serial number. */ #else __ino64_t st_ino; /* File serial number. */ @@ -74,6 +74,8 @@ 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 3ec74becbc..046e7f7d5d 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,99 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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_quad_t __ino64_t; +typedef __u_long __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 9db15616cc..bd7ddcc9bc 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -4,7 +4,6 @@ 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 9828066178..36a1e0e0e3 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,99 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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_quad_t __ino64_t; +typedef __u_long __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 0f841edcd6..0a8e0c47f9 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, 1999 Free Software Foundation, Inc. + Copyright (C) 1991, 1995, 1996, 1997 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; -#if defined _HAVE___PAD1 && !defined _NO_LFS___PAD1 +#ifdef _HAVE___PAD1 buf->__pad1 = 0; #endif buf->st_ino = kbuf->st_ino; -- cgit 1.4.1