diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-05-11 07:03:33 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-05-11 07:03:33 -0700 |
| commit | 6c4b58bda758a547748ecd42b323221eab8cf241 (patch) | |
| tree | 748b0fed5fdc5165404161cc4e5ae4079da32050 | |
| parent | b7a24de37727c0f3d10fb640eb9ebe36e3aed0f2 (diff) | |
| parent | 37e3643f8f048d8387419a43abc51236eadbeb1e (diff) | |
| download | mruby-6c4b58bda758a547748ecd42b323221eab8cf241.tar.gz mruby-6c4b58bda758a547748ecd42b323221eab8cf241.zip | |
Merge pull request #1250 from Archytaus/master
Fix for 'inline' macro redefinition error in VS2012 C++
| -rw-r--r-- | include/mrbconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 72bae93f6..2b9cc5e60 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -116,6 +116,7 @@ typedef short mrb_sym; #endif #ifdef _MSC_VER +# define _ALLOW_KEYWORD_MACROS # include <float.h> # define inline __inline # define snprintf _snprintf |