From f963da22ecc25c51971d802037736ae540321441 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Tue, 13 May 2014 11:01:11 +0100 Subject: [PATCH] Undef private *_BODY defines after use Bug: 14865741 Change-Id: I1398f7b3f64e3c94f2714cede5b61205dfa78a24 --- libc/include/dirent.h | 2 ++ libc/include/sys/stat.h | 2 ++ libc/include/sys/vfs.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/libc/include/dirent.h b/libc/include/dirent.h index bfe4ea42a..71eb2e71e 100644 --- a/libc/include/dirent.h +++ b/libc/include/dirent.h @@ -56,6 +56,8 @@ __BEGIN_DECLS struct dirent { __DIRENT64_BODY }; struct dirent64 { __DIRENT64_BODY }; +#undef __DIRENT64_BODY + #define d_fileno d_ino typedef struct DIR DIR; diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h index e62e76d55..c0c168b2e 100644 --- a/libc/include/sys/stat.h +++ b/libc/include/sys/stat.h @@ -130,6 +130,8 @@ __BEGIN_DECLS struct stat { __STAT64_BODY }; struct stat64 { __STAT64_BODY }; +#undef __STAT64_BODY + #define st_atimensec st_atime_nsec #define st_mtimensec st_mtime_nsec #define st_ctimensec st_ctime_nsec diff --git a/libc/include/sys/vfs.h b/libc/include/sys/vfs.h index cd6044d6e..5358ffb8a 100644 --- a/libc/include/sys/vfs.h +++ b/libc/include/sys/vfs.h @@ -107,6 +107,8 @@ typedef __fsid_t fsid_t; struct statfs { __STATFS64_BODY }; struct statfs64 { __STATFS64_BODY }; +#undef __STATFS64_BODY + /* Declare that we have the f_namelen, f_frsize, and f_flags fields. */ #define _STATFS_F_NAMELEN #define _STATFS_F_FRSIZE