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

am a5193f2f: am c631bb21: Merge "Fix the types of some of the struct stat fields."

Browse Source 
* commit 'a5193f2ffe39ff88f27ffb34a6967e023cb3daee':
  Fix the types of some of the struct stat fields.
This commit is contained in:
Elliott Hughes
2014-12-18 23:45:30 +00:00
committed by Android Git Automerger
parent 3801189b58 a5193f2ffe
commit 649386ae1a
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libc/include/sys/stat.h
View File

@@ -38,15 +38,15 @@ __BEGIN_DECLS
#if defined(__aarch64__) #if defined(__aarch64__)
#define __STAT64_BODY \ #define __STAT64_BODY \
unsigned long st_dev; \ dev_t st_dev; \
unsigned long st_ino; \ ino_t st_ino; \
unsigned int st_mode; \ mode_t st_mode; \
unsigned int st_nlink; \ nlink_t st_nlink; \
uid_t st_uid; \ uid_t st_uid; \
gid_t st_gid; \ gid_t st_gid; \
unsigned long st_rdev; \ dev_t st_rdev; \
unsigned long __pad1; \ unsigned long __pad1; \
long st_size; \ off_t st_size; \
int st_blksize; \ int st_blksize; \
int __pad2; \ int __pad2; \
long st_blocks; \ long st_blocks; \
@@ -56,13 +56,13 @@ __BEGIN_DECLS
unsigned int __unused4; \ unsigned int __unused4; \
unsigned int __unused5; \ unsigned int __unused5; \
#elif defined(__mips__) #elif defined(__mips__) /* and mips64 */
#define __STAT64_BODY \ #define __STAT64_BODY \
unsigned int st_dev; \ unsigned int st_dev; \
unsigned int __pad0[3]; \ unsigned int __pad0[3]; \
unsigned long long st_ino; \ unsigned long long st_ino; \
unsigned int st_mode; \ mode_t st_mode; \
unsigned int st_nlink; \ nlink_t st_nlink; \
uid_t st_uid; \ uid_t st_uid; \
gid_t st_gid; \ gid_t st_gid; \
unsigned int st_rdev; \ unsigned int st_rdev; \
@@ -93,13 +93,13 @@ __BEGIN_DECLS
struct timespec st_ctim; \ struct timespec st_ctim; \
long __pad3[3]; \ long __pad3[3]; \
#else #else /* __arm__ || __i386__ */
#define __STAT64_BODY \ #define __STAT64_BODY \
unsigned long long st_dev; \ unsigned long long st_dev; \
unsigned char __pad0[4]; \ unsigned char __pad0[4]; \
unsigned long __st_ino; \ unsigned long __st_ino; \
unsigned int st_mode; \ unsigned int st_mode; \
unsigned int st_nlink; \ nlink_t st_nlink; \
uid_t st_uid; \ uid_t st_uid; \
gid_t st_gid; \ gid_t st_gid; \
unsigned long long st_rdev; \ unsigned long long st_rdev; \