On 12/09/2012 07:46 AM, Akim Demaille wrote: > No, it does not. Actually, it breaks it completely.
Ah, I expect it's because I forgot about the second branch in that #if. How about this patch instead? --- ChangeLog | 7 +++++++ m4/extern-inline.m4 | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 413e435..e7708ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-12-09 Paul Eggert <egg...@cs.ucla.edu> + + extern-inline: avoid incompatibility with Darwin Libc + * m4/extern-inline.m4 (_GL_INLINE, _GL_EXTERN_INLINE) [__APPLE__]: + Do not use extern inline. Problem reported by Akim Demaille in + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + 2012-12-08 Stefano Lattarini <stefano.lattar...@gmail.com> maint.mk: avoid extra forks diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 2492260..47ad972 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -16,13 +16,19 @@ AC_DEFUN([gl_EXTERN_INLINE], when FOO is an inline function in the header; see <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. */ -#if (__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) -- 1.7.11.7
