diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-24 22:39:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-24 22:41:56 -0700 |
| commit | 27e6afeb6fe1f0b9f083fdfeacf6d69c6936a34a (patch) | |
| tree | a1bdf790a993c537044305912d3d4796789dccb0 /lib/acl-internal.h | |
| parent | 52ba851db188de47b303120df00c77e3aad7e542 (diff) | |
| download | emacs-27e6afeb6fe1f0b9f083fdfeacf6d69c6936a34a.tar.gz | |
Merge from gnulib
This incorporates:
2015-04-24 file-has-acl: new module, split from acl
2015-04-24 manywarnings: add GCC 5.1 warnings
2015-04-21 lstat: fix cross-compilation 'ln -s' problem
2015-04-15 qacl: Simplify HP-UX acl_nontrivial check
2015-04-15 acl: On Linux, check for acls without libacl
2015-04-14 tempname: avoid unused parameter warnings (trivial)
* lib/acl-internal.c: New file, from gnulib.
* lib/file-has-acl.c: Remove; no longer imported from gnulib.
* lib/acl-internal.h, lib/gnulib.mk, lib/qcopy-acl.c, lib/tempname.c:
* m4/acl.m4, m4/gnulib-comp.m4, m4/lstat.m4, m4/manywarnings.m4:
Update from gnulib.
Diffstat (limited to 'lib/acl-internal.h')
| -rw-r--r-- | lib/acl-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 243ca32b822..9b9fae2e9e0 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -220,7 +220,7 @@ extern int acl_ace_nontrivial (int count, ace_t *entries) _GL_ATTRIBUTE_PURE; /* Return 1 if the given ACL is non-trivial. Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -extern int acl_nontrivial (int count, struct acl_entry *entries, struct stat *sb); +extern int acl_nontrivial (int count, struct acl_entry *entries); # if HAVE_ACLV_H /* HP-UX >= 11.11 */ |