[Emacs-diffs] /srv/bzr/emacs/trunk r110269: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 110269
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 21:19:32 -0700
message:
  Merge from gnulib.
modified:
  ChangeLog
  m4/extern-inline.m4

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-27 23:02:23 +0000
+++ b/ChangeLog 2012-09-30 04:19:32 +0000
@@ -1,3 +1,8 @@
+2012-09-30  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2012-09-28 extern-inline: provide a -Wundef safe config.h
+
 2012-09-27  Paul Eggert  <address@hidden>
 
        Check more robustly for timer_settime.

=== modified file 'm4/extern-inline.m4'
--- a/m4/extern-inline.m4       2012-08-21 14:37:56 +0000
+++ b/m4/extern-inline.m4       2012-09-30 04:19:32 +0000
@@ -18,7 +18,9 @@
      <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 @@
 #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 \