Fix return value type of bytecode_decoder

cb29c9b4 · Kazuaki Tanaka · 968ebac0 · cb29c9b4 · cb29c9b4
Commit cb29c9b4 authored Sep 20, 2016 by Kazuaki Tanaka
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

include/mruby.h include/mruby.h +1 -1

src/vm.c src/vm.c +2 -2

No files found.
--- 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;

--- 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