From cb4cc28370e4d7d57307b8b917ac9557ab488669 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 22 Apr 2001 23:52:06 +0000 Subject: * libc/include/sys/unistd.h [X_OK]: Use better protection against Cygwin X_OK definitions in sys/file.h. --- newlib/ChangeLog | 5 +++++ newlib/libc/include/sys/unistd.h | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'newlib') diff --git a/newlib/ChangeLog b/newlib/ChangeLog index de33e60..07e2f03 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2001-04-22 Earnie Boyd + + * 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 * 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 fc8c25a..806cc06 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 -- cgit v1.1