diff options
| author | Eli Zaretskii | 2011-11-05 16:10:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-05 16:10:27 +0200 |
| commit | 955f3b13c68da47a1771fce0cc1e997e5837c8ba (patch) | |
| tree | 5cf4ad736c9cc3dce46c30d5bdd363e51cd642c9 | |
| parent | a97f8f3f16c6370acb0076011588822e572fa589 (diff) | |
| download | emacs-955f3b13c68da47a1771fce0cc1e997e5837c8ba.tar.gz emacs-955f3b13c68da47a1771fce0cc1e997e5837c8ba.zip | |
Fix compilation with MSVC in lib/.
nt/config.nt (inline) [!__GNUC__]: Define to __inline for MSVC.
| -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 21ab0c477b7..30d7824c778 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-11-05 Eli Zaretskii <eliz@gnu.org> | 1 | 2011-11-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * config.nt (inline) [!__GNUC__]: Define to __inline for MSVC. | ||
| 4 | |||
| 3 | Support MSVC build with newer versions of Visual Studio. | 5 | Support MSVC build with newer versions of Visual Studio. |
| 4 | * makefile.w32-in (clean-other-dirs-nmake) | 6 | * makefile.w32-in (clean-other-dirs-nmake) |
| 5 | (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake): | 7 | (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/>. */ | |||
| 328 | 328 | ||
| 329 | /* Define to `__inline__' or `__inline' if that's what the C compiler | 329 | /* Define to `__inline__' or `__inline' if that's what the C compiler |
| 330 | calls it, or to nothing if 'inline' is not supported under any name. */ | 330 | calls it, or to nothing if 'inline' is not supported under any name. */ |
| 331 | #ifdef __GNUC__ | ||
| 331 | #ifndef __cplusplus | 332 | #ifndef __cplusplus |
| 332 | #undef inline | 333 | #undef inline |
| 333 | #endif | 334 | #endif |
| 335 | #else /* MSVC */ | ||
| 336 | #define inline __inline | ||
| 337 | #endif | ||
| 334 | 338 | ||
| 335 | /* Define to the equivalent of the C99 'restrict' keyword, or to | 339 | /* Define to the equivalent of the C99 'restrict' keyword, or to |
| 336 | nothing if this is not supported. Do not define if restrict is | 340 | nothing if this is not supported. Do not define if restrict is |