diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-05 08:22:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-05 08:23:11 -0700 |
| commit | 1323c13978b7280ddf034e8f527f48d17487b5a2 (patch) | |
| tree | 969cb5381db64e141d0b55ddea68f6e3751a1817 /lib/acl-internal.h | |
| parent | b9e14de6cf08a19fa5d98742b71c5580a50a40d8 (diff) | |
| download | emacs-1323c13978b7280ddf034e8f527f48d17487b5a2.tar.gz | |
Merge from gnulib
This incorporates:
2015-07-04 file-has-acl, acl-permissions: fix HP-UX typos
2015-07-03 set-permissions.c: adjust acl_from_mode's cpp guard
2015-07-02 update-copyright: fix test failure with perl >= 5.22
2015-07-01 gnulib-common.m4: change the ARFLAGS default to 'cr'
2015-07-01 acl: fix definition of acl_from_mode on FreeBSD
* build-aux/update-copyright, doc/misc/texinfo.tex, lib/acl-internal.h:
* lib/set-permissions.c, m4/gnulib-common.m4: Copy from gnulib.
Diffstat (limited to 'lib/acl-internal.h')
| -rw-r--r-- | lib/acl-internal.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/acl-internal.h b/lib/acl-internal.h index d592a7559f0..4f042adc96b 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -127,10 +127,8 @@ rpl_acl_set_fd (int fd, acl_t acl) # define acl_extended_file(name) (-1) # endif -/* Linux-specific */ -# ifndef HAVE_ACL_FROM_MODE -# define HAVE_ACL_FROM_MODE false -# define acl_from_mode(mode) (NULL) +# if ! defined HAVE_ACL_FROM_MODE && ! defined HAVE_ACL_FROM_TEXT +# define acl_from_mode (NULL) # endif /* Set to 0 if a file's mode is stored independently from the ACL. */ |