diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-06-06 18:37:45 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-06-06 18:38:30 -0700 |
| commit | 325bf192ae281046834884b12705d6c522871b24 (patch) | |
| tree | 4faf44a87bd0fde9ea9134e7cb928b629d8558e1 /lib/acl-internal.h | |
| parent | 6fec047e9470731d588e52f516c1c704a7a55411 (diff) | |
| download | emacs-325bf192ae281046834884b12705d6c522871b24.tar.gz emacs-325bf192ae281046834884b12705d6c522871b24.tar.bz2 emacs-325bf192ae281046834884b12705d6c522871b24.zip | |
Merge from gnulib
This incorporates:
2015-06-06 acl-permissions: pacify -Wsuggest-attribute=const
2015-06-05 stdio: Don't redefine gets when using C++
2015-06-05 acl-permissions: port to AIX, C89 HP-UX
2015-06-02 file-has-acl: fix build on Mac OS X 10
2015-06-01 gnulib-tool: concatenate lib_SOURCES to a single line
2015-06-01 pthread_sigmask: discount system version if a simple macro
2015-05-31 readlinkat: avoid OS X 10.10 trailing slash bug
* doc/misc/texinfo.tex, lib/acl-internal.h, lib/get-permissions.c:
* lib/readlinkat.c, lib/set-permissions.c, lib/stdio.in.h:
* m4/acl.m4, m4/pthread_sigmask.m4, m4/readlinkat.m4: Copy from gnulib.
* lib/gnulib.mk: Regenerate.
Diffstat (limited to 'lib/acl-internal.h')
| -rw-r--r-- | lib/acl-internal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 11fdea14042..d592a7559f0 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -289,6 +289,10 @@ struct permission_context { int get_permissions (const char *, int, mode_t, struct permission_context *); int set_permissions (struct permission_context *, const char *, int); -void free_permission_context (struct permission_context *); +void free_permission_context (struct permission_context *) +#if ! (defined USE_ACL && (HAVE_ACL_GET_FILE || defined GETACL)) + _GL_ATTRIBUTE_CONST +#endif + ; _GL_INLINE_HEADER_END |