auto upstream

2 files changed, 6 insertions, 8 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index dd79cfc2526..3cbe45fbd0e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+
 2012-11-24  Ken Brown  <kbrown@cornell.edu>
 
         * config.nt (HAVE_MOUSE): Remove.
diff --git a/nt/config.nt b/nt/config.nt
index 60223306752..baa10198a8c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1541,8 +1541,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # 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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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__.