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

[Juanma Barranquero]

------------------------------------------------------------
revno: 109750
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-22 13:30:25 +0200
message:
  nt/config.nt: Sync with autogen/config.in.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-08-17 10:51:29 +0000
+++ b/nt/ChangeLog      2012-08-22 11:30:25 +0000
@@ -1,3 +1,7 @@
+2012-08-22  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+
 2012-08-17  Juanma Barranquero  <address@hidden>
 
        * config.nt: Sync with autogen/config.in.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-08-17 10:51:29 +0000
+++ b/nt/config.nt      2012-08-22 11:30:25 +0000
@@ -1563,20 +1563,34 @@
 #if __GNUC__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-#  define _GL_INLINE_HEADER_BEGIN \
-     _Pragma ("GCC diagnostic push") \
-     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-     _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"")
-#  define _GL_INLINE_HEADER_END \
-     _Pragma ("GCC diagnostic pop")
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# if __GNUC_GNU_INLINE__
+   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
+#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+#  define _GL_INLINE extern inline
 # endif
+# define _GL_EXTERN_INLINE extern
 #else
 # define _GL_INLINE static inline
 # define _GL_EXTERN_INLINE static inline
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if __GNUC_STDC_INLINE__
+#  define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+#  define _GL_INLINE_HEADER_CONST_PRAGMA \
+     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+# define _GL_INLINE_HEADER_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+    _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+    _Pragma ("GCC diagnostic pop")
+#else
 # define _GL_INLINE_HEADER_BEGIN
 # define _GL_INLINE_HEADER_END
 #endif