summaryrefslogtreecommitdiffhomepage
path: root/include/mruby.h
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-05-16 11:34:00 -0700
committerDaniel Bovensiepen <[email protected]>2012-05-16 11:34:00 -0700
commit0cc8dcc0ee658eca9193a5611104f6d05cb958fd (patch)
tree0c123371d208a692f80197c1b0babb631302442a /include/mruby.h
parent3bec8b330c58a7ac9a73ed3689b1bd9cde389c16 (diff)
parent25415302399055a566e4d55b6c165937943aa678 (diff)
downloadmruby-0cc8dcc0ee658eca9193a5611104f6d05cb958fd.tar.gz
mruby-0cc8dcc0ee658eca9193a5611104f6d05cb958fd.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/mruby.h')
-rw-r--r--include/mruby.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 7a46992ee..f3eb16a01 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -287,7 +287,8 @@ void mrb_include_module(mrb_state*, struct RClass*, struct RClass*);
void mrb_define_method(mrb_state*, struct RClass*, const char*, mrb_func_t,int);
void mrb_define_class_method(mrb_state *, struct RClass *, const char *, mrb_func_t, int);
-void mrb_define_singleton_method(mrb_state*, void*, const char*, mrb_func_t,int);
+void mrb_define_singleton_method(mrb_state*, struct RObject*, const char*, mrb_func_t,int);
+void mrb_define_module_function(mrb_state*, struct RClass*, const char*, mrb_func_t,int);
void mrb_define_const(mrb_state*, struct RClass*, const char *name, mrb_value);
mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
struct RClass * mrb_class_new(mrb_state *mrb, struct RClass *super);