X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstdio.in.h;fp=lib%2Fstdio.in.h;h=f534854f3b02711ab1e39ce8de9959520b2a80a4;hb=458c944ddbb41cd6ba34416db2867eb6f17bf61a;hp=d945d5cebb021da9c654a9a43f9966e41c43c955;hpb=6a8461af29d6ce87d891ca8e1433848f5f4c45b8;p=gnulib.git

diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index d945d5ceb..f534854f3 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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@