diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-09-19 14:40:08 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-09-19 14:40:08 -0700 |
commit | 230fe2a5a10f2bc128f354e3fb1b48536b1f143b (patch) | |
tree | b282d5f242b8ada877d188d03d43da78b175d67a /lib/stdio.in.h | |
parent | c39cc7d149d28060c40bc206eb8a63f7a0636301 (diff) | |
download | emacs-230fe2a5a10f2bc128f354e3fb1b48536b1f143b.tar.gz |
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/stdio.in.h')
-rw-r--r-- | lib/stdio.in.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 06cbad00d3d..76e62fba6ba 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -124,6 +124,15 @@ #define _GL_STDIO_STRINGIZE(token) #token #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token) +/* When also using extern inline, suppress the use of static inline in + standard headers of problematic Apple configurations, as Libc at + least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + Perhaps Apple will fix this some day. */ +#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ + && defined __GNUC__ && defined __STDC__) +# undef putc_unlocked +#endif #if @GNULIB_DPRINTF@ # if @REPLACE_DPRINTF@ |