From ba12ad69f1db39bf0bcb937821e7a3991cc42dbc Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 1 Dec 2012 21:09:30 +0100 Subject: [PATCH] nt/config.nt: Sync with autogen/config.in. --- nt/ChangeLog | 4 ++++ nt/config.nt | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index dd79cfc252..3cbe45fbd0 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-12-01 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + 2012-11-24 Ken Brown * config.nt (HAVE_MOUSE): Remove. diff --git a/nt/config.nt b/nt/config.nt index 6022330675..baa10198a8 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1541,8 +1541,8 @@ along with GNU Emacs. If not, see . */ # 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 . */ /* 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__. -- 2.39.2