From 61522196c71593da09572fce9af9e0d7dad61bc3 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 23 Apr 2013 09:44:36 +0000
Subject: 	* Merge in cygwin-64bit-branch.

---
 winsup/cygwin/include/mntent.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'winsup/cygwin/include/mntent.h')

diff --git a/winsup/cygwin/include/mntent.h b/winsup/cygwin/include/mntent.h
index db87904ef..5a0c13054 100644
--- a/winsup/cygwin/include/mntent.h
+++ b/winsup/cygwin/include/mntent.h
@@ -33,9 +33,7 @@ struct mntent *getmntent_r (FILE *, struct mntent *, char *, int);
 int endmntent (FILE *__filep);
 #endif
 
-#ifdef __CYGWIN__
-/* Only include paths.h if building for Cygwin.  This avoids including
-   newlib headers when building the native tools in winsup/utils. */
+#ifndef _NOMNTENT_MACROS
 
 #include <paths.h>
 
@@ -52,7 +50,7 @@ int endmntent (FILE *__filep);
 #define MOUNTED _PATH_MOUNTED
 #endif
 
-#endif /* __CYGWIN__ */
+#endif /* !_NOMNTENT_MACROS */
 
 #ifdef __cplusplus
 };
-- 
cgit v1.2.3