diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-22 16:36:43 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-11-22 16:36:43 +0900 |
| commit | 03e399accf4d833b3e9e4fba00ee22c65e1dca95 (patch) | |
| tree | 6b24e184d48006fd7c4064915918f155c5706967 /include/mruby.h | |
| parent | de415b7bc0d59e4cd7f08ed19246d467f1acb350 (diff) | |
| parent | b21b02465e6643879394b41494a3462079347a92 (diff) | |
| download | mruby-03e399accf4d833b3e9e4fba00ee22c65e1dca95.tar.gz mruby-03e399accf4d833b3e9e4fba00ee22c65e1dca95.zip | |
Merge pull request #3262 from dabroz/feature-nanbox64fix
Fixed NaN boxing for 64-bit configrations
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/mruby.h b/include/mruby.h index 1b227d41a..e6eaf7f27 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -32,6 +32,21 @@ #include <stddef.h> #include <limits.h> +#ifdef MRB_DEBUG +#include <assert.h> +#define mrb_assert(p) assert(p) +#define mrb_assert_int_fit(t1,n,t2,max) assert((n)>=0 && ((sizeof(n)<=sizeof(t2))||(n<=(t1)(max)))) +#else +#define mrb_assert(p) ((void)0) +#define mrb_assert_int_fit(t1,n,t2,max) ((void)0) +#endif + +#if __STDC_VERSION__ >= 201112L +#define mrb_static_assert(exp, str) _Static_assert(exp, str) +#else +#define mrb_static_assert(exp, str) mrb_assert(exp) +#endif + #include "mrbconf.h" #include "mruby/common.h" #include <mruby/value.h> @@ -1135,21 +1150,6 @@ MRB_API void mrb_state_atexit(mrb_state *mrb, mrb_atexit_func func); MRB_API void mrb_show_version(mrb_state *mrb); MRB_API void mrb_show_copyright(mrb_state *mrb); -#ifdef MRB_DEBUG -#include <assert.h> -#define mrb_assert(p) assert(p) -#define mrb_assert_int_fit(t1,n,t2,max) assert((n)>=0 && ((sizeof(n)<=sizeof(t2))||(n<=(t1)(max)))) -#else -#define mrb_assert(p) ((void)0) -#define mrb_assert_int_fit(t1,n,t2,max) ((void)0) -#endif - -#if __STDC_VERSION__ >= 201112L -#define mrb_static_assert(exp, str) _Static_assert(exp, str) -#else -#define mrb_static_assert(exp, str) mrb_assert(exp) -#endif - MRB_API mrb_value mrb_format(mrb_state *mrb, const char *format, ...); MRB_END_DECL |