From f2cc4ea7282aa7c668c6fafd4bb4d10f3b8a6a89 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 30 Sep 2012 14:27:23 +0200
Subject: [PATCH] nt/config.nt: Sync with autogen/config.in.

---
 nt/ChangeLog | 6 +++++-
 nt/config.nt | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nt/ChangeLog b/nt/ChangeLog
index a2948662567..208ce1c5ffa 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,6 +1,10 @@
+2012-09-30  Juanma Barranquero  <lekktu@gmail.com>
+
+	* config.nt: Sync with autogen/config.in.
+
 2012-09-29  Juanma Barranquero  <lekktu@gmail.com>
 
-	* config.nt: Sync with autogen/config.in
+	* config.nt: Sync with autogen/config.in.
 	(HAVE_TIMER_SETTIME): New macro.
 
 2012-09-23  Eli Zaretskii  <eliz@gnu.org>
diff --git a/nt/config.nt b/nt/config.nt
index f8ba4ff9c6c..3b398eae04c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1531,7 +1531,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      <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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 \
-- 
2.11.4.GIT