2 files changed, 3 insertions, 3 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 57121fecf..5375529dc 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -177,7 +177,7 @@ typedef struct mrb_state {
 #endif
 
 #ifdef MRB_BYTECODE_DECODE_OPTION
-  void (*bytecode_decoder)(struct mrb_state* mrb, mrb_code *code);
+  mrb_code (*bytecode_decoder)(struct mrb_state* mrb, mrb_code code);
 #endif
 
   struct RClass *eException_class;
diff --git a/src/vm.c b/src/vm.c
index d0c86c6c7..832c6c3b2 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -720,9 +720,9 @@ argnum_error(mrb_state *mrb, mrb_int num)
 #endif
 
 #ifdef MRB_BYTECODE_DECODE_OPTION
-#define BYTECODE_DECODER(x) if( (mrb)->bytecode_decoder ) (mrb)->bytecode_decoder((mrb), (x))
+#define BYTECODE_DECODER(x) ((mrb)->bytecode_decoder)?(mrb)->bytecode_decoder((mrb), (x)):(x)
 #else
-#define BYTECODE_DECODER(x) (x);
+#define BYTECODE_DECODER(x) (x)
 #endif