summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTomasz Dąbrowski <[email protected]>2016-11-21 12:03:45 +0100
committerTomasz Dąbrowski <[email protected]>2016-11-21 12:37:45 +0100
commitc385782cfef484ca9cb07b128d325cfb712de69c (patch)
treee294fd1fa336a09a511351791a23d22ddb88ce74
parent8cdaf1ed35e808f73fe06c84998ffa59d414f8cc (diff)
downloadmruby-c385782cfef484ca9cb07b128d325cfb712de69c.tar.gz
mruby-c385782cfef484ca9cb07b128d325cfb712de69c.zip
mrb_assert definition moved to the beggining of mruby.h
So that other files can immediately use it.
-rw-r--r--include/mruby.h30
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