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

[Juanma Barranquero]

------------------------------------------------------------
revno: 111058
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-01 21:09:30 +0100
message:
  nt/config.nt: Sync with autogen/config.in.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-27 03:10:32 +0000
+++ b/nt/ChangeLog      2012-12-01 20:09:30 +0000
@@ -1,3 +1,7 @@
+2012-12-01  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+
 2012-11-24  Ken Brown  <address@hidden>
 
        * config.nt (HAVE_MOUSE): Remove.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-11-27 03:10:32 +0000
+++ b/nt/config.nt      2012-12-01 20:09:30 +0000
@@ -1541,8 +1541,8 @@
 # endif
 # define _GL_EXTERN_INLINE extern
 #else
-# define _GL_INLINE static inline
-# define _GL_EXTERN_INLINE static inline
+# define _GL_INLINE static
+# define _GL_EXTERN_INLINE static
 #endif
 
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
@@ -1570,12 +1570,6 @@
 /* Define to rpl_gmtime if the replacement function should be used. */
 #undef gmtime
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.