[Emacs-diffs] /srv/bzr/emacs/trunk r106295: Fix compilation with MSVC in lib/.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106295
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-05 16:10:27 +0200
message:
  Fix compilation with MSVC in lib/.
  
   nt/config.nt (inline) [!__GNUC__]: Define to __inline for MSVC.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-11-05 11:34:56 +0000
+++ b/nt/ChangeLog      2011-11-05 14:10:27 +0000
@@ -1,5 +1,7 @@
 2011-11-05  Eli Zaretskii  <address@hidden>
 
+       * 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):

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2011-10-31 02:25:01 +0000
+++ b/nt/config.nt      2011-11-05 14:10:27 +0000
@@ -328,9 +328,13 @@
 
 /* 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