summaryrefslogtreecommitdiffhomepage
path: root/include/mruby.h
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-04-21 00:51:29 +0900
committerYukihiro Matsumoto <[email protected]>2012-04-21 00:51:29 +0900
commit3ea69ab4bd003265b6da2d7fb9c72dce9b295108 (patch)
tree331013915a509a30bd38e70825349a557eed5480 /include/mruby.h
parentc138d7ef0a2365fd7da6a6374f9fa607633f07d5 (diff)
parent431b45156e0dd7970bd7ca39682d6b3fc0fadc8f (diff)
downloadmruby-3ea69ab4bd003265b6da2d7fb9c72dce9b295108.tar.gz
mruby-3ea69ab4bd003265b6da2d7fb9c72dce9b295108.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'include/mruby.h')
-rw-r--r--include/mruby.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h
index eb121c971..e2a497eb6 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -75,7 +75,7 @@ typedef struct mrb_value {
#define mrb_test(o) ((o).tt != MRB_TT_FALSE)
#define mrb_fixnum(o) (o).value.i
#define mrb_float(o) (o).value.f
-#define mrb_symbol(o) (o).value.sym
+#define mrb_symbol(o) (o).value.sym
#define mrb_object(o) (o).value.p
#define FIXNUM_P(o) ((o).tt == MRB_TT_FIXNUM)
#define UNDEF_P(o) ((o).tt == MRB_TT_UNDEF)
@@ -388,6 +388,10 @@ void mrb_write_barrier(mrb_state *, struct RBasic*);
#define MRUBY_VERSION "Rite"
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
#if 0
#define DEBUG(x) x
#else