diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-06-02 04:49:15 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-06-02 04:49:15 -0700 |
| commit | 29d5f616fad90970766c1e11718ab3e10abb9123 (patch) | |
| tree | f8e36987989c41cbc155b1f48aa72eb88e89a82b /include | |
| parent | 98fb528f6f80ade0f08e9a373cb89848bc3ded13 (diff) | |
| parent | c3e0aedece10344a6b3288e0e036273f6d5ba4ba (diff) | |
| download | mruby-29d5f616fad90970766c1e11718ab3e10abb9123.tar.gz mruby-29d5f616fad90970766c1e11718ab3e10abb9123.zip | |
Merge pull request #228 from fceller/master
fixed prototype warning (-Wstrict-prototypes)
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 11 | ||||
| -rw-r--r-- | include/mruby/variable.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/mruby.h b/include/mruby.h index 3bbc6e6cc..70bbdf3c2 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -147,7 +147,7 @@ mrb_obj_value(void *p) } static inline mrb_value -mrb_false_value() +mrb_false_value(void) { mrb_value v; @@ -157,7 +157,7 @@ mrb_false_value() } static inline mrb_value -mrb_nil_value() +mrb_nil_value(void) { mrb_value v; @@ -167,7 +167,7 @@ mrb_nil_value() } static inline mrb_value -mrb_true_value() +mrb_true_value(void) { mrb_value v; @@ -177,7 +177,7 @@ mrb_true_value() } static inline mrb_value -mrb_undef_value() +mrb_undef_value(void) { mrb_value v; @@ -416,6 +416,9 @@ mrb_value mrb_check_funcall(mrb_state *mrb, mrb_value recv, mrb_sym mid, int arg #define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c))) #endif +mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len); +void mrb_exc_raise(mrb_state *mrb, mrb_value exc); + int mrb_block_given_p(void); void mrb_raise(mrb_state *mrb, struct RClass *c, const char *fmt, ...); void rb_raise(struct RClass *c, const char *fmt, ...); diff --git a/include/mruby/variable.h b/include/mruby/variable.h index 880d6217e..400dd50b0 100644 --- a/include/mruby/variable.h +++ b/include/mruby/variable.h @@ -14,8 +14,8 @@ extern "C" { typedef struct global_variable { int counter; mrb_value *data; - mrb_value (*getter)(); - void (*setter)(); + mrb_value (*getter)(void); + void (*setter)(void); //void (*marker)(); //int block_trace; //struct trace_var *trace; |
