diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-11-05 16:10:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-11-05 16:10:27 +0200 |
| commit | d8554f06e3eee8dc052a903388e21dd3b3eca15a (patch) | |
| tree | 3b45bd8ab0d882f9d7aa84cd6cf45cbab7301bb4 /nt | |
| parent | 965c51221846d90214626fa572a0f3d8e0d4d6d7 (diff) | |
| download | emacs-d8554f06e3eee8dc052a903388e21dd3b3eca15a.tar.gz | |
Fix compilation with MSVC in lib/.
nt/config.nt (inline) [!__GNUC__]: Define to __inline for MSVC.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 2 | ||||
| -rw-r--r-- | nt/config.nt | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index f8d88728c04..6a8b24c51b7 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,7 @@ 2011-11-05 Eli Zaretskii <eliz@gnu.org> + * 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 <http://www.gnu.org/licenses/>. */ /* 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 |