diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
| commit | 0b4f33213729a87e146d990604330c70896dac07 (patch) | |
| tree | ab1a1d05bac250042f3dfe040ee21d89c162ac21 /include | |
| parent | b2e6a0fc04f6237f5118bf6c2f404a0d8fa4d2c4 (diff) | |
| parent | f06eceaa1965794fd2ba9910c83b4e0459550a21 (diff) | |
| download | mruby-0b4f33213729a87e146d990604330c70896dac07.tar.gz mruby-0b4f33213729a87e146d990604330c70896dac07.zip | |
merge conflict resolution
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h index 0ce4926a8..579375d9f 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -332,9 +332,10 @@ mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, int,...); mrb_value mrb_funcall_argv(mrb_state*, mrb_value, const char*, int, mrb_value*); mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, const char*, int, mrb_value*, mrb_value); mrb_sym mrb_intern(mrb_state*,const char*); -mrb_sym mrb_intern2(mrb_state*,const char*, int); +mrb_sym mrb_intern2(mrb_state*,const char*,int); mrb_sym mrb_intern_str(mrb_state*,mrb_value); const char *mrb_sym2name(mrb_state*,mrb_sym); +const char *mrb_sym2name_len(mrb_state*,mrb_sym,int*); mrb_value mrb_str_format(mrb_state *, int, const mrb_value *, mrb_value); void *mrb_malloc(mrb_state*, size_t); |