From: cgf <cgf>
Date: Sun, 22 Apr 2001 23:52:06 +0000 (+0000)
Subject: * libc/include/sys/unistd.h [X_OK]: Use better protection against Cygwin X_OK
X-Git-Tag: cygwin_daemon_merge_HEAD~5310
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b1d01a66c62c6cab2f921ac00e63fc32dc645e21;p=pf3gnuchains%2Fpf3gnuchains4x.git

* libc/include/sys/unistd.h [X_OK]: Use better protection against Cygwin X_OK
definitions in sys/file.h.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index de33e6075b..07e2f03b18 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-22  Earnie Boyd  <earnie@users.sourceforge.net>
+  
+	* libc/include/sys/unistd.h [X_OK]: Use better protection against
+	Cygwin X_OK definitions in sys/file.h.
+
 Fri Apr 20 23:17:51 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* libc/include/sys/time.h: Define timercmp and other macros for
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index fc8c25acca..806cc06c74 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -128,13 +128,14 @@ int     _EXFUN(readlink, (const char *__path, char *__buf, int __buflen));
 int     _EXFUN(symlink, (const char *__name1, const char *__name2));
 #endif
 
-# define	F_OK	0
-# define	R_OK	4
-# define	W_OK	2
-# define	X_OK	1
+#define	F_OK	0
+#define	R_OK	4
+#define	W_OK	2
 
-#if defined (__CYGWIN__) && !defined (__INSIDE_CYGWIN__)
-# undef		X_OK
+#undef X_OK
+#if !defined (__CYGWIN__) || defined (__INSIDE_CYGWIN__)
+# define	X_OK	1
+#else
 # define X_OK	_cygwin_X_OK
 extern const unsigned _cygwin_X_OK;
 #endif