Merge "Undef private *_BODY defines after use"

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;

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

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