From: Eli Zaretskii Date: Sat, 5 Nov 2011 14:10:27 +0000 (+0200) Subject: Fix compilation with MSVC in lib/. X-Git-Tag: emacs-pretest-24.0.92~218^2~13 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=955f3b13c68da47a1771fce0cc1e997e5837c8ba;p=emacs.git Fix compilation with MSVC in lib/. nt/config.nt (inline) [!__GNUC__]: Define to __inline for MSVC. --- diff --git a/nt/ChangeLog b/nt/ChangeLog index 21ab0c477b7..30d7824c778 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,7 @@ 2011-11-05 Eli Zaretskii + * config.nt (inline) [!__GNUC__]: Define to __inline for MSVC. + Support MSVC build with newer versions of Visual Studio. * makefile.w32-in (clean-other-dirs-nmake) (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake): diff --git a/nt/config.nt b/nt/config.nt index 87c5f5cc8aa..53c7b50a32a 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -328,9 +328,13 @@ along with GNU Emacs. If not, see . */ /* 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. */ +#ifdef __GNUC__ #ifndef __cplusplus #undef inline #endif +#else /* MSVC */ +#define inline __inline +#endif /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is