* libc/include/sys/stat.h: Revert March 3, Cygwin change.

* libc/include/sys/Ditto.h: Ditto.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index aaae584a892ac119dcbd2452477dd49f56cb5b6e..5866fc4cc0584904806f26de63e2f35e626a7fe7 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+Mon May  7 20:39:25 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * libc/include/sys/stat.h: Revert March 3, Cygwin change.
+       * libc/include/sys/Ditto.h: Ditto.
+
 2001-05-04  Earnie Boyd  <earnie@users.sourceforge.net>
 
         * libc/string/strrchr.c: Use strchr for the speed improvements.

diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 802244f3d8200fd920e620e88ad09be9622a6140..bca437707c5004d0370db51418a65d5d5c93aaee 100644 (file)
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -106,18 +106,6 @@ struct     stat
 #define                S_IWOTH 0000002 /* write permission, other */
 #define                S_IXOTH 0000001/* execute/search permission, other */
 
-#if defined (__CYGWIN__) && !defined (__INSIDE_CYGWIN__)
-extern unsigned const _cygwin_S_IEXEC, _cygwin_S_IXUSR, _cygwin_S_IXGRP, _cygwin_S_IXOTH;
-#undef S_IEXEC
-#undef S_IXUSR
-#undef S_IXGRP
-#undef S_IXOTH
-#define S_IEXEC                _cygwin_S_IEXEC
-#define S_IXUSR                _cygwin_S_IXUSR
-#define S_IXGRP                _cygwin_S_IXGRP
-#define S_IXOTH                _cygwin_S_IXOTH
-#endif
-
 #define        S_ISBLK(m)      (((m)&_IFMT) == _IFBLK)
 #define        S_ISCHR(m)      (((m)&_IFMT) == _IFCHR)
 #define        S_ISDIR(m)      (((m)&_IFMT) == _IFDIR)

diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 806cc06c74ab6f6957c0ba961343a712d2cf0a9b..e80c942c97f2e95e2dbde24e70dc12925d6c8032 100644 (file)
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -131,14 +131,7 @@ int     _EXFUN(symlink, (const char *__name1, const char *__name2));
 #define        F_OK    0
 #define        R_OK    4
 #define        W_OK    2
-
-#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
+#define        X_OK    1
 
 # define       SEEK_SET        0
 # define       SEEK_CUR        1