diff options
| author | Paul Eggert | 2013-09-19 14:40:08 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-09-19 14:40:08 -0700 |
| commit | 230fe2a5a10f2bc128f354e3fb1b48536b1f143b (patch) | |
| tree | b282d5f242b8ada877d188d03d43da78b175d67a /lib/acl-internal.h | |
| parent | c39cc7d149d28060c40bc206eb8a63f7a0636301 (diff) | |
| download | emacs-230fe2a5a10f2bc128f354e3fb1b48536b1f143b.tar.gz emacs-230fe2a5a10f2bc128f354e3fb1b48536b1f143b.zip | |
Merge from gnulib.
This incorporates the following changes:
2013-09-19 stdio: OS X port of putc_unlocked + extern inline
2013-09-19 signal: OS X port of sigaddset etc. + extern inline
2013-09-19 extern-inline: do not always suppress extern inline on OS X
2013-09-17 getgroups: statement without effect
2013-08-28 headers: check that _GL_INLINE_HEADER_BEGIN is defined
Diffstat (limited to 'lib/acl-internal.h')
| -rw-r--r-- | lib/acl-internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 7e6d77a5fd4..55c224ca883 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h | |||
| @@ -60,6 +60,9 @@ extern int aclsort (int, int, struct acl *); | |||
| 60 | # define fchmod(fd, mode) (-1) | 60 | # define fchmod(fd, mode) (-1) |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | #ifndef _GL_INLINE_HEADER_BEGIN | ||
| 64 | #error "Please include config.h first." | ||
| 65 | #endif | ||
| 63 | _GL_INLINE_HEADER_BEGIN | 66 | _GL_INLINE_HEADER_BEGIN |
| 64 | #ifndef ACL_INTERNAL_INLINE | 67 | #ifndef ACL_INTERNAL_INLINE |
| 65 | # define ACL_INTERNAL_INLINE _GL_INLINE | 68 | # define ACL_INTERNAL_INLINE _GL_INLINE |