From ca60ed47488dfbbdf3aec79426f5758c814c4880 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 8 May 2001 01:15:06 +0000 Subject: [PATCH] * libc/include/sys/stat.h: Revert March 3, Cygwin change. * libc/include/sys/Ditto.h: Ditto. --- newlib/ChangeLog | 5 +++++ newlib/libc/include/sys/stat.h | 12 ------------ newlib/libc/include/sys/unistd.h | 9 +-------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index aaae584a8..5866fc4cc 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +Mon May 7 20:39:25 2001 Christopher Faylor + + * libc/include/sys/stat.h: Revert March 3, Cygwin change. + * libc/include/sys/Ditto.h: Ditto. + 2001-05-04 Earnie Boyd * 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 802244f3d..bca437707 100644 --- 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 806cc06c7..e80c942c9 100644 --- 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