From 8597e37982fbac935eca0bc082b67d4373186856 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 29 Mar 2007 22:50:45 +0000 Subject: [PATCH] * lib/acl-internal.h (acl_get_fd, acl_set_fd): undef before defining, to work around a problem on OSF/1 5.1 reported by Bruno Haible. 2007-03-29 Eric Blake * lib/acl-internal.h: Remove redundant include. (ACL_NOT_WELL_SUPPORTED): Also filter on EBUSY, returned by Cygwin when a file is locked. --- ChangeLog | 11 +++++++++++ lib/acl-internal.h | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31f192f73..230c3eab8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-03-29 Paul Eggert + + * lib/acl-internal.h (acl_get_fd, acl_set_fd): undef before defining, + to work around a problem on OSF/1 5.1 reported by Bruno Haible. + +2007-03-29 Eric Blake + + * lib/acl-internal.h: Remove redundant include. + (ACL_NOT_WELL_SUPPORTED): Also filter on EBUSY, returned by + Cygwin when a file is locked. + 2007-03-29 Bruno Haible * lib/vasprintf.c [IN_LIBASPRINTF]: Include different specification diff --git a/lib/acl-internal.h b/lib/acl-internal.h index e224a78dc..d74a66d9a 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -18,8 +18,6 @@ Written by Paul Eggert and Andreas Gruenbacher. */ -#include - #include "acl.h" #include @@ -55,12 +53,14 @@ /* POSIX 1003.1e (draft 17) */ #ifndef HAVE_ACL_GET_FD # define HAVE_ACL_GET_FD false +# undef acl_get_fd # define acl_get_fd(fd) (NULL) #endif /* POSIX 1003.1e (draft 17) */ #ifndef HAVE_ACL_SET_FD # define HAVE_ACL_SET_FD false +# undef acl_set_fd # define acl_set_fd(fd, acl) (-1) #endif @@ -76,8 +76,8 @@ # define acl_from_mode(mode) (NULL) #endif -#define ACL_NOT_WELL_SUPPORTED(Errno) \ - ((Errno) == ENOTSUP || (Errno) == ENOSYS || (Errno) == EINVAL) +#define ACL_NOT_WELL_SUPPORTED(Err) \ + ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY) /* Define a replacement for acl_entries if needed. */ #if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_FREE && !HAVE_ACL_ENTRIES -- 2.11.0