tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix <dirent.h> d_ino/d_off types."

Browse source
This commit is contained in:
Elliott Hughes 2017-07-06 21:15:35 +00:00 committed by Gerrit Code Review
commit 913ae73395
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libc/include/dirent.h
View file

@ -31,6 +31,7 @@
#include <stdint.h> #include <stdint.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -46,17 +47,24 @@ __BEGIN_DECLS
#define DT_WHT 14 #define DT_WHT 14
#endif #endif
#if defined(__LP64__)
#define __DIRENT64_INO_T ino_t
#else
#define __DIRENT64_INO_T uint64_t /* Historical accident. */
#endif
#define __DIRENT64_BODY \ #define __DIRENT64_BODY \
uint64_t d_ino; \ __DIRENT64_INO_T d_ino; \
int64_t d_off; \ off64_t d_off; \
unsigned short d_reclen; \ unsigned short d_reclen; \
unsigned char d_type; \ unsigned char d_type; \
char d_name[256]; \ char d_name[256]; \
struct dirent { __DIRENT64_BODY }; struct dirent { __DIRENT64_BODY };
struct dirent64 { __DIRENT64_BODY }; struct dirent64 { __DIRENT64_BODY };
#undef __DIRENT64_BODY #undef __DIRENT64_BODY
#undef __DIRENT64_INO_T
/* glibc compatibility. */ /* glibc compatibility. */
#undef _DIRENT_HAVE_D_NAMLEN /* Linux doesn't have a d_namlen field. */ #undef _DIRENT_HAVE_D_NAMLEN /* Linux doesn't have a d_namlen field. */