Skip to content

M
mruby
Commit 6c4b58bd authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Merge pull request #1250 from Archytaus/master 

Fix for 'inline' macro redefinition error in VS2012 C++
parents b7a24de3 37e3643f
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
include/mrbconf.h
View file @ 6c4b58bd
...@@ -116,6 +116,7 @@ typedef short mrb_sym; ...@@ -116,6 +116,7 @@ typedef short mrb_sym;
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
# define _ALLOW_KEYWORD_MACROS
# include <float.h> # include <float.h>
# define inline __inline # define inline __inline
# define snprintf _snprintf # define snprintf _snprintf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment