diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-29 20:59:53 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 01:58:23 -0700 |
| commit | 32d8297adbb0fc03f1e0706005e144c7f498507c (patch) | |
| tree | 4880f1f090f9af6788c0638a81adc8b0df723ccf /lib/acl-internal.h | |
| parent | c0d12ddf618396354fdb23264cbda30f81d0d344 (diff) | |
| download | gnulib-32d8297adbb0fc03f1e0706005e144c7f498507c.tar.gz | |
acl, mbchar, priv-set: use extern-inline
* lib/set-mode-acl.c, lib/acl-internal.h (ACL_INTERNAL_INLINE):
* lib/mbchar.c, lib/mbchar.h (MBCHAR_INLINE):
* lib/priv-set.c, lib/priv-set.h (PRIV_SET_INLINE):
New macros.
* lib/acl-internal.h, lib/mbchar.h, lib/priv-set.h:
Replace all uses of 'static inline' with it.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* m4/acl.m4 (gl_FUNC_ACL):
* m4/mbchar.m4 (gl_MBCHAR):
* m4/priv-set.m4 (gl_PRIV_SET):
Remove AC_C_INLINE, since 'inline' is no longer used directly.
* modules/acl, modules/mbchar, modules/priv-set (Depends-on):
Add extern-inline.
Diffstat (limited to 'lib/acl-internal.h')
| -rw-r--r-- | lib/acl-internal.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 7fe0a8728a..a6974d9469 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -82,6 +82,11 @@ extern int aclsort (int, int, struct acl *); ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY) #endif +_GL_INLINE_HEADER_BEGIN +#ifndef ACL_INTERNAL_INLINE +# define ACL_INTERNAL_INLINE _GL_INLINE +#endif + #if USE_ACL # if HAVE_ACL_GET_FILE @@ -97,7 +102,7 @@ extern int aclsort (int, int, struct acl *); /* Most platforms have a 1-argument acl_get_fd, only OSF/1 has a 2-argument macro(!). */ # if HAVE_ACL_FREE_TEXT /* OSF/1 */ -static inline acl_t +ACL_INTERNAL_INLINE acl_t rpl_acl_get_fd (int fd) { return acl_get_fd (fd, ACL_TYPE_ACCESS); @@ -116,7 +121,7 @@ rpl_acl_get_fd (int fd) /* Most platforms have a 2-argument acl_set_fd, only OSF/1 has a 3-argument macro(!). */ # if HAVE_ACL_FREE_TEXT /* OSF/1 */ -static inline int +ACL_INTERNAL_INLINE int rpl_acl_set_fd (int fd, acl_t acl) { return acl_set_fd (fd, ACL_TYPE_ACCESS, acl); @@ -263,3 +268,5 @@ extern int acl_nontrivial (int count, struct acl *entries); # endif #endif + +_GL_INLINE_HEADER_END |