aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-12-18 17:17:42 -0600
committerElliott Hughes2014-12-18 17:17:42 -0600
commit9257c477aeafe6b48cb0b7ed8c63f4f2b88453ee (patch)
tree101ed342b719fc2845282d62168a9ca2659b3ea7
parent8597c2b3f2ac3df9abe30378cdd3ecd559d995e7 (diff)
downloadplatform-bionic-9257c477aeafe6b48cb0b7ed8c63f4f2b88453ee.tar.gz
platform-bionic-9257c477aeafe6b48cb0b7ed8c63f4f2b88453ee.tar.xz
platform-bionic-9257c477aeafe6b48cb0b7ed8c63f4f2b88453ee.zip
Fix the types of some of the struct stat fields.
Bug: 17062519 Change-Id: I5207867939f3c2876bf6448e565fa4364aa7e4f0
-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 5c82a5b2..9fed170a 100644
--- a/libc/include/sys/stat.h
+++ b/libc/include/sys/stat.h
@@ -39,15 +39,15 @@ __BEGIN_DECLS
39 39
40#if defined(__aarch64__) 40#if defined(__aarch64__)
41#define __STAT64_BODY \ 41#define __STAT64_BODY \
42 unsigned long st_dev; \ 42 dev_t st_dev; \
43 unsigned long st_ino; \ 43 ino_t st_ino; \
44 unsigned int st_mode; \ 44 mode_t st_mode; \
45 unsigned int st_nlink; \ 45 nlink_t st_nlink; \
46 uid_t st_uid; \ 46 uid_t st_uid; \
47 gid_t st_gid; \ 47 gid_t st_gid; \
48 unsigned long st_rdev; \ 48 dev_t st_rdev; \
49 unsigned long __pad1; \ 49 unsigned long __pad1; \
50 long st_size; \ 50 off_t st_size; \
51 int st_blksize; \ 51 int st_blksize; \
52 int __pad2; \ 52 int __pad2; \
53 long st_blocks; \ 53 long st_blocks; \
@@ -57,13 +57,13 @@ __BEGIN_DECLS
57 unsigned int __unused4; \ 57 unsigned int __unused4; \
58 unsigned int __unused5; \ 58 unsigned int __unused5; \
59 59
60#elif defined(__mips__) 60#elif defined(__mips__) /* and mips64 */
61#define __STAT64_BODY \ 61#define __STAT64_BODY \
62 unsigned int st_dev; \ 62 unsigned int st_dev; \
63 unsigned int __pad0[3]; \ 63 unsigned int __pad0[3]; \
64 unsigned long long st_ino; \ 64 unsigned long long st_ino; \
65 unsigned int st_mode; \ 65 mode_t st_mode; \
66 unsigned int st_nlink; \ 66 nlink_t st_nlink; \
67 uid_t st_uid; \ 67 uid_t st_uid; \
68 gid_t st_gid; \ 68 gid_t st_gid; \
69 unsigned int st_rdev; \ 69 unsigned int st_rdev; \
@@ -94,13 +94,13 @@ __BEGIN_DECLS
94 struct timespec st_ctim; \ 94 struct timespec st_ctim; \
95 long __pad3[3]; \ 95 long __pad3[3]; \
96 96
97#else 97#else /* __arm__ || __i386__ */
98#define __STAT64_BODY \ 98#define __STAT64_BODY \
99 unsigned long long st_dev; \ 99 unsigned long long st_dev; \
100 unsigned char __pad0[4]; \ 100 unsigned char __pad0[4]; \
101 unsigned long __st_ino; \ 101 unsigned long __st_ino; \
102 unsigned int st_mode; \ 102 unsigned int st_mode; \
103 unsigned int st_nlink; \ 103 nlink_t st_nlink; \
104 uid_t st_uid; \ 104 uid_t st_uid; \
105 gid_t st_gid; \ 105 gid_t st_gid; \
106 unsigned long long st_rdev; \ 106 unsigned long long st_rdev; \