diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-04-02 23:07:31 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-04-02 23:07:31 +0900 |
| commit | cb3e1433a48a067b8c7b73b3b4878efe46390703 (patch) | |
| tree | 68365f95887f8c9e95f23d7b8860745fd96b76dc /include | |
| parent | 0573306f510b9503f6baa7e9e1d158205add503d (diff) | |
| parent | 6424569a63fa05f65c3966c2988ff0fc8c468938 (diff) | |
| download | mruby-cb3e1433a48a067b8c7b73b3b4878efe46390703.tar.gz mruby-cb3e1433a48a067b8c7b73b3b4878efe46390703.zip | |
Merge pull request #2753 from cremno/vs2015-has-inline-kw
MSVC 2015 implements inline keyword
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/value.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/mruby/value.h b/include/mruby/value.h index f27800366..7aa0783e1 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -40,17 +40,15 @@ struct mrb_state; # define str_to_mrb_float(buf) strtod(buf, NULL) #endif -#ifdef _MSC_VER +#if defined _MSC_VER && _MSC_VER < 1900 # ifndef __cplusplus # define inline __inline # endif -# if _MSC_VER < 1900 -# include <stdarg.h> +# include <stdarg.h> MRB_API int mrb_msvc_vsnprintf(char *s, size_t n, const char *format, va_list arg); MRB_API int mrb_msvc_snprintf(char *s, size_t n, const char *format, ...); -# define vsnprintf(s, n, format, arg) mrb_msvc_vsnprintf(s, n, format, arg) -# define snprintf(s, n, format, ...) mrb_msvc_snprintf(s, n, format, __VA_ARGS__) -# endif +# define vsnprintf(s, n, format, arg) mrb_msvc_vsnprintf(s, n, format, arg) +# define snprintf(s, n, format, ...) mrb_msvc_snprintf(s, n, format, __VA_ARGS__) # if _MSC_VER < 1800 # include <float.h> # define isfinite(n) _finite(n) |