aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-12-18 17:38:26 -0600
committerGerrit Code Review2014-12-18 17:38:26 -0600
commitc631bb215e29981222f19c092ded49c7c1f15845 (patch)
tree13fce594705618a08ac14747845e1dbb344f656a
parentb7f0693aaac9907070443ee6e47fe1d594b42251 (diff)
parent9257c477aeafe6b48cb0b7ed8c63f4f2b88453ee (diff)
downloadplatform-bionic-c631bb215e29981222f19c092ded49c7c1f15845.tar.gz
platform-bionic-c631bb215e29981222f19c092ded49c7c1f15845.tar.xz
platform-bionic-c631bb215e29981222f19c092ded49c7c1f15845.zip
Merge "Fix the types of some of the struct stat fields."
-rw-r--r--libc/include/sys/stat.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h
index b1bc4ba1..7017865b 100644
--- a/libc/include/sys/stat.h
+++ b/libc/include/sys/stat.h
@@ -38,15 +38,15 @@ __BEGIN_DECLS
38 38
39#if defined(__aarch64__) 39#if defined(__aarch64__)
40#define __STAT64_BODY \ 40#define __STAT64_BODY \
41 unsigned long st_dev; \ 41 dev_t st_dev; \
42 unsigned long st_ino; \ 42 ino_t st_ino; \
43 unsigned int st_mode; \ 43 mode_t st_mode; \
44 unsigned int st_nlink; \ 44 nlink_t st_nlink; \
45 uid_t st_uid; \ 45 uid_t st_uid; \
46 gid_t st_gid; \ 46 gid_t st_gid; \
47 unsigned long st_rdev; \ 47 dev_t st_rdev; \
48 unsigned long __pad1; \ 48 unsigned long __pad1; \
49 long st_size; \ 49 off_t st_size; \
50 int st_blksize; \ 50 int st_blksize; \
51 int __pad2; \ 51 int __pad2; \
52 long st_blocks; \ 52 long st_blocks; \
@@ -56,13 +56,13 @@ __BEGIN_DECLS
56 unsigned int __unused4; \ 56 unsigned int __unused4; \
57 unsigned int __unused5; \ 57 unsigned int __unused5; \
58 58
59#elif defined(__mips__) 59#elif defined(__mips__) /* and mips64 */
60#define __STAT64_BODY \ 60#define __STAT64_BODY \
61 unsigned int st_dev; \ 61 unsigned int st_dev; \
62 unsigned int __pad0[3]; \ 62 unsigned int __pad0[3]; \
63 unsigned long long st_ino; \ 63 unsigned long long st_ino; \
64 unsigned int st_mode; \ 64 mode_t st_mode; \
65 unsigned int st_nlink; \ 65 nlink_t st_nlink; \
66 uid_t st_uid; \ 66 uid_t st_uid; \
67 gid_t st_gid; \ 67 gid_t st_gid; \
68 unsigned int st_rdev; \ 68 unsigned int st_rdev; \
@@ -93,13 +93,13 @@ __BEGIN_DECLS
93 struct timespec st_ctim; \ 93 struct timespec st_ctim; \
94 long __pad3[3]; \ 94 long __pad3[3]; \
95 95
96#else 96#else /* __arm__ || __i386__ */
97#define __STAT64_BODY \ 97#define __STAT64_BODY \
98 unsigned long long st_dev; \ 98 unsigned long long st_dev; \
99 unsigned char __pad0[4]; \ 99 unsigned char __pad0[4]; \
100 unsigned long __st_ino; \ 100 unsigned long __st_ino; \
101 unsigned int st_mode; \ 101 unsigned int st_mode; \
102 unsigned int st_nlink; \ 102 nlink_t st_nlink; \
103 uid_t st_uid; \ 103 uid_t st_uid; \
104 gid_t st_gid; \ 104 gid_t st_gid; \
105 unsigned long long st_rdev; \ 105 unsigned long long st_rdev; \