diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-02-15 18:30:53 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-02-20 11:46:54 +0900 |
| commit | 49bb2e64ccca130f8e1a0b6ad36d442c1ad44ed7 (patch) | |
| tree | 072f73419854d07b7a9251bd08991edbb385d031 /win32 | |
| parent | 4e6bae47c833cd82942172712f30ac23ab06c9fe (diff) | |
| download | ruby-49bb2e64ccca130f8e1a0b6ad36d442c1ad44ed7.tar.gz | |
avoid defining inline
Recent (since 2012 maybe?) MSVC ships a header named xkeycheck.h, which
(kindly!) aborts compilation on redefinition of C++ keywords. Let's not
define this in case of C++.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ea5789fd3e..bd350dcd31 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -860,8 +860,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define RUBY_SETJMP(env) _setjmp(env) #define RUBY_LONGJMP(env,val) longjmp(env,val) #define RUBY_JMP_BUF jmp_buf -#define inline __inline #ifndef __cplusplus +#define inline __inline !if $(MSC_VER) >= 1800 #define restrict __restrict !else |