diff options
Diffstat (limited to 'libc/sysdeps/linux/sparc/bits')
| -rw-r--r-- | libc/sysdeps/linux/sparc/bits/stat.h | 72 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sparc/bits/types.h | 19 |
2 files changed, 17 insertions, 74 deletions
diff --git a/libc/sysdeps/linux/sparc/bits/stat.h b/libc/sysdeps/linux/sparc/bits/stat.h index aefcf9ee1..d1f729129 100644 --- a/libc/sysdeps/linux/sparc/bits/stat.h +++ b/libc/sysdeps/linux/sparc/bits/stat.h @@ -33,72 +33,18 @@ #define _MKNOD_VER _MKNOD_VER_LINUX /* The bits defined below. */ -struct stat - { - __dev_t st_dev; /* Device. */ -#if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64 - unsigned short int __pad1; - __ino_t st_ino; /* File serial number. */ -#else - __ino64_t st_ino; /* File serial number. */ -#endif - __mode_t st_mode; /* File mode. */ - __nlink_t st_nlink; /* Link count. */ - __uid_t st_uid; /* User ID of the file's owner. */ - __gid_t st_gid; /* Group ID of the file's group.*/ - __dev_t st_rdev; /* Device number, if device. */ - unsigned short int __pad2; -#ifndef __USE_FILE_OFFSET64 - __off_t st_size; /* Size of file, in bytes. */ -#else - __off64_t st_size; /* Size of file, in bytes. */ -#endif - __blksize_t st_blksize; /* Optimal block size for I/O. */ - -#ifndef __USE_FILE_OFFSET64 - __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ -#else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ -#endif - __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; - __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; - __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; - unsigned long int __unused4; - unsigned long int __unused5; - }; - +/* Pull in whatever this particular arch's kernel thinks that struct stat + * should look like. It turns out that each arch has a different opinion + * on the subject, and different kernel revs use different names... */ +#define new_stat stat +#include <asm/stat.h> #ifdef __USE_LARGEFILE64 -struct stat64 - { - __dev_t st_dev; /* Device. */ -#if __WORDSIZE == 64 - unsigned short int __pad1; -#endif - __ino64_t st_ino; /* File serial number. */ - __mode_t st_mode; /* File mode. */ - __nlink_t st_nlink; /* Link count. */ - __uid_t st_uid; /* User ID of the file's owner. */ - __gid_t st_gid; /* Group ID of the file's group.*/ - __dev_t st_rdev; /* Device number, if device. */ - unsigned short int __pad2; - __off64_t st_size; /* Size of file, in bytes. */ - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; - __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; - __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; - unsigned long int __unused4; - unsigned long int __unused5; - }; +# ifdef __USE_FILE_OFFSET64 +# define stat stat64 +# endif #endif + /* Tell code we have these members. */ #define _STATBUF_ST_BLKSIZE #define _STATBUF_ST_RDEV diff --git a/libc/sysdeps/linux/sparc/bits/types.h b/libc/sysdeps/linux/sparc/bits/types.h index 1530931b6..5dccfc4cb 100644 --- a/libc/sysdeps/linux/sparc/bits/types.h +++ b/libc/sysdeps/linux/sparc/bits/types.h @@ -78,22 +78,19 @@ __extension__ typedef unsigned long long int __uint64_t; #endif typedef __quad_t *__qaddr_t; +/* changed to be more compatible with kernel */ typedef __kernel_dev_t __dev_t; /* Type of device numbers. */ typedef __kernel_uid_t __uid_t; /* Type of user identifications. */ typedef __kernel_gid_t __gid_t; /* Type of group identifications. */ -typedef __u_long __ino_t; /* Type of file serial numbers. */ +typedef __kernel_ino_t __ino_t; /* Type of file serial numbers. */ +typedef __kernel_mode_t __mode_t; /* Type of file attribute bitmasks. */ +typedef __kernel_nlink_t __nlink_t; /* Type of file link counts. */ +typedef __kernel_off_t __off_t; /* Type of file sizes and offsets. */ +typedef __kernel_loff_t __loff_t; /* Type of file sizes and offsets. */ +typedef __kernel_pid_t __pid_t; /* Type of process identifications. */ +typedef __kernel_ssize_t __ssize_t; /* Type of a byte count, or error. */ typedef __u_quad_t __ino64_t; /* Type of file serial numbers. */ -typedef __u_int __mode_t; /* Type of file attribute bitmasks. */ -typedef __u_int __nlink_t; /* Type of file link counts. */ -typedef long int __off_t; /* Type of file sizes and offsets. */ typedef __quad_t __off64_t; /* "" (LFS) */ -typedef __quad_t __loff_t; /* Type of file sizes and offsets. */ -typedef int __pid_t; /* Type of process identifications. */ -#if __WORDSIZE == 64 -typedef long int __ssize_t; /* Type of a byte count, or error. */ -#else -typedef int __ssize_t; /* Type of a byte count, or error. */ -#endif typedef __u_long __rlim_t; /* Type of resource counts. */ typedef __u_quad_t __rlim64_t; /* Type of resource counts (LFS). */ typedef __u_int __id_t; /* General type for IDs. */ |