generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Define fsid_t as well as __fsid_t."

Browse Source
This commit is contained in:
Elliott Hughes 2014-01-08 02:11:04 +00:00 committed by Gerrit Code Review
commit 1c1b83549f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/include/sys/vfs.h
View File

@ -36,6 +36,7 @@ __BEGIN_DECLS
/* The kernel's __kernel_fsid_t has a 'val' member but glibc uses '__val'. */ /* The kernel's __kernel_fsid_t has a 'val' member but glibc uses '__val'. */
typedef struct { int __val[2]; } __fsid_t; typedef struct { int __val[2]; } __fsid_t;
typedef __fsid_t fsid_t;
#if defined(__LP64__) #if defined(__LP64__)
struct statfs { struct statfs {
@ -46,7 +47,7 @@ struct statfs {
uint64_t f_bavail; uint64_t f_bavail;
uint64_t f_files; uint64_t f_files;
uint64_t f_ffree; uint64_t f_ffree;
__fsid_t f_fsid; fsid_t f_fsid;
uint64_t f_namelen; uint64_t f_namelen;
uint64_t f_frsize; uint64_t f_frsize;
uint64_t f_flags; uint64_t f_flags;
@ -64,7 +65,7 @@ struct statfs {
uint64_t f_files; uint64_t f_files;
uint64_t f_ffree; uint64_t f_ffree;
uint64_t f_bavail; uint64_t f_bavail;
__fsid_t f_fsid; fsid_t f_fsid;
uint32_t f_namelen; uint32_t f_namelen;
uint32_t f_flags; uint32_t f_flags;
uint32_t f_spare[5]; uint32_t f_spare[5];
@ -79,7 +80,7 @@ struct statfs {
uint64_t f_bavail; uint64_t f_bavail;
uint64_t f_files; uint64_t f_files;
uint64_t f_ffree; uint64_t f_ffree;
__fsid_t f_fsid; fsid_t f_fsid;
uint32_t f_namelen; uint32_t f_namelen;
uint32_t f_frsize; uint32_t f_frsize;
uint32_t f_flags; uint32_t f_flags;