diff options
| author | Eli Zaretskii <[email protected]> | 2011-11-05 16:10:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2011-11-05 16:10:27 +0200 |
| commit | 955f3b13c68da47a1771fce0cc1e997e5837c8ba (patch) | |
| tree | 5cf4ad736c9cc3dce46c30d5bdd363e51cd642c9 /nt | |
| parent | a97f8f3f16c6370acb0076011588822e572fa589 (diff) | |
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 21ab0c477b..30d7824c77 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,7 @@ 2011-11-05 Eli Zaretskii <[email protected]> + * 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 87c5f5cc8a..53c7b50a32 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 |