[Emacs-diffs] /srv/bzr/emacs/trunk r110280: nt/config.nt: Sync with autogen/config.in.

[Juanma Barranquero]

------------------------------------------------------------
revno: 110280
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 14:27:23 +0200
message:
  nt/config.nt: Sync with autogen/config.in.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-09-29 17:06:28 +0000
+++ b/nt/ChangeLog      2012-09-30 12:27:23 +0000
@@ -1,6 +1,10 @@
+2012-09-30  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+
 2012-09-29  Juanma Barranquero  <address@hidden>
 
-       * config.nt: Sync with autogen/config.in
+       * config.nt: Sync with autogen/config.in.
        (HAVE_TIMER_SETTIME): New macro.
 
 2012-09-23  Eli Zaretskii  <address@hidden>

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-09-29 17:06:28 +0000
+++ b/nt/config.nt      2012-09-30 12:27:23 +0000
@@ -1531,7 +1531,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__)
@@ -1548,7 +1550,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 \