From 8a49e50930a7f7d85919f1dabeada59e8160c9d5 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 19 Mar 2002 09:45:56 +0000 Subject: [PATCH] Cleanup x86 types. --- sysdeps/unix/sysv/linux/x86_64/bits/types.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/types.h b/sysdeps/unix/sysv/linux/x86_64/bits/types.h index 640a336..e46e5a0 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/types.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/types.h @@ -69,25 +69,32 @@ __extension__ typedef unsigned long long int __uint64_t; #endif typedef __quad_t *__qaddr_t; +#if __WORDSIZE == 64 typedef __uint64_t __dev_t; /* Type of device numbers. */ +#else +typedef __u_quad_t __dev_t; /* Type of device numbers. */ +#endif typedef __uint32_t __uid_t; /* Type of user identifications. */ typedef __uint32_t __gid_t; /* Type of group identifications. */ #if __WORDSIZE == 64 typedef __uint64_t __ino_t; /* Type of file serial numbers. */ +typedef __uint64_t __ino64_t; /* "" (LFS) */ #else -typedef __u_long__ino_t; /* Type of file serial numbers. */ +typedef __u_long __ino_t; /* Type of file serial numbers. */ +typedef __u_quad_t __ino64_t; /* "" (LFS) */ #endif -typedef __uint64_t __ino64_t; /* "" (LFS) */ typedef __uint32_t __mode_t; /* Type of file attribute bitmasks. */ #if __WORDSIZE == 64 typedef __uint64_t __nlink_t; /* Type of file link counts. */ typedef __int64_t __off_t; /* Type of file sizes and offsets. */ +typedef __quad_t __loff_t; /* Type of file sizes and offsets. */ +typedef __loff_t __off64_t; /* "" (LFS) */ #else typedef __u_int __nlink_t; /* Type of file link counts. */ typedef long int __off_t; /* Type of file sizes and offsets. */ -#endif -typedef __int64_t __off64_t; /* "" (LFS) */ typedef __int64_t __loff_t; /* Type of file sizes and offsets. */ +typedef __int64_t __off64_t; /* "" (LFS) */ +#endif typedef __int32_t __pid_t; /* Type of process identifications. */ #if __WORDSIZE == 64 typedef __int64_t __ssize_t; /* Type of a byte count, or error. */ @@ -106,7 +113,7 @@ typedef __u_long __rlim_t; /* Type of resource counts. */ typedef __u_quad_t __rlim64_t; /* Type of resource counts (LFS). */ typedef long int __blkcnt_t; /* Type to count nr disk blocks. */ typedef __quad_t __blkcnt64_t; /* "" (LFS) */ -typedef __long __fsblkcnt_t; /* Type to count file system blocks. */ +typedef __u_long __fsblkcnt_t; /* Type to count file system blocks. */ typedef __u_quad_t __fsblkcnt64_t; /* "" (LFS) */ typedef __u_long __fsfilcnt_t; /* Type to count file system inodes. */ typedef __u_quad_t __fsfilcnt64_t; /* "" (LFS) */ -- 2.7.4