diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
| commit | 04d9c5ea6bfbdaf425526cf3556704f6b9fd0971 (patch) | |
| tree | c1659854546676c402a25679b8236ec467a6ef3d /include/mruby.h | |
| parent | d04f6abb00051465f59be4cda54e593a64923f8e (diff) | |
| parent | fc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff) | |
| download | mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip | |
resolve conflict regarding backtick
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h index 84aeff0d7..c5c607893 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -189,13 +189,20 @@ int mrb_get_args(mrb_state *mrb, const char *format, ...); mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, int,...); mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, int, mrb_value*); mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, mrb_value*, mrb_value); -mrb_sym mrb_intern(mrb_state*,const char*); +mrb_sym mrb_intern_cstr(mrb_state*,const char*); mrb_sym mrb_intern2(mrb_state*,const char*,size_t); 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,size_t*); mrb_value mrb_str_format(mrb_state *, int, const mrb_value *, mrb_value); +/* For backward compatibility. */ +static inline +mrb_sym mrb_intern(mrb_state *mrb,const char *cstr) +{ + return mrb_intern_cstr(mrb, cstr); +} + void *mrb_malloc(mrb_state*, size_t); void *mrb_calloc(mrb_state*, size_t, size_t); void *mrb_realloc(mrb_state*, void*, size_t); |