Merge pull request #701 from monaka/pr-remove-debug-macros

Remove debug macros from mruby.h

3 files changed, 7 insertions, 11 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 197961c86..480a764e5 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -241,16 +241,6 @@ void mrb_write_barrier(mrb_state *, struct RBasic*);
 
 #define MRUBY_VERSION "Rite"
 
-#ifdef DEBUG
-#undef DEBUG
-#endif
-
-#if 0
-#define DEBUG(x) x
-#else
-#define DEBUG(x)
-#endif
-
 mrb_value mrb_check_convert_type(mrb_state *mrb, mrb_value val, mrb_int type, const char *tname, const char *method);
 mrb_value mrb_any_to_s(mrb_state *mrb, mrb_value obj);
 const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj);
diff --git a/src/gc.c b/src/gc.c
index 472535925..816f258ad 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -147,8 +147,10 @@ gettimeofday_time(void)
 #ifdef GC_DEBUG
 #include <assert.h>
 #define gc_assert(expect) assert(expect)
+#define DEBUG(x) (x)
 #else
 #define gc_assert(expect) ((void)0)
+#define DEBUG(x)
 #endif
 
 #define GC_STEP_SIZE 1024
diff --git a/src/vm.c b/src/vm.c
index b84158d1d..8ae28ef5e 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -49,7 +49,11 @@ The value below allows about 60000 recursive calls in the simplest case. */
 #define MRB_STACK_MAX ((1<<18) - MRB_STACK_GROWTH)
 #endif
 
-
+#ifdef VM_DEBUG
+# define DEBUG(x) (x)
+#else
+# define DEBUG(x)
+#endif
 
 static inline void
 stack_copy(mrb_value *dst, const mrb_value *src, size_t size)