From 0f4ffde865f93f55600d54fc8363c6ef8d5ea7ef Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 17 Dec 2014 10:33:55 -0800
Subject: [PATCH] Adapt to bits/stat.h changes.

---
 sysdeps/nacl/xstatconv.h | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/sysdeps/nacl/xstatconv.h b/sysdeps/nacl/xstatconv.h
index 1bfbb73de2f..2567242c754 100644
--- a/sysdeps/nacl/xstatconv.h
+++ b/sysdeps/nacl/xstatconv.h
@@ -25,19 +25,8 @@ struct stat;
 /* stat.h uses nacl_abi_off_t, but irt.h defines only nacl_irt_off_t.  */
 typedef nacl_irt_off_t nacl_abi_off_t;
 
-/* We use this header to define struct nacl_abi_stat.  But we must avoid
-   its excess declarations, and defining these names away is (marginally)
-   cleaner than #undef'ing __native_client__.  */
-#undef  stat
-#define stat    __avoid_nacl_stat
-#undef  fstat
-#define fstat   __avoid_nacl_fstat
-#undef  lstat
-#define lstat   __avoid_nacl_lstat
-#include <native_client/src/trusted/service_runtime/include/sys/stat.h>
-#undef  stat
-#undef  fstat
-#undef  lstat
+/* We use this header to define struct nacl_abi_stat.  */
+#include <native_client/src/trusted/service_runtime/include/bits/stat.h>
 
 extern int __xstat_conv (int vers, const struct nacl_abi_stat *, void *)
   internal_function attribute_hidden;
-- 
2.47.2