Merge from gnulib.

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c7de7d7c14d..411ef633420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-09-28 extern-inline: provide a -Wundef safe config.h
+
 2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Check more robustly for timer_settime.
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 12f24fab95f..600c8d3fa17 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -18,7 +18,9 @@ AC_DEFUN([gl_EXTERN_INLINE],
      <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__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__
+#if (__GNUC__ \
+     ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+     : 199901L <= __STDC_VERSION__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
 #elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
@@ -35,7 +37,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
 #endif
 
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if __GNUC_STDC_INLINE__
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
 #  define _GL_INLINE_HEADER_CONST_PRAGMA
 # else
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \