summaryrefslogtreecommitdiffhomepage
path: root/src/symbol.c
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-03-23 11:08:18 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-03-23 11:08:18 +0900
commit04d9c5ea6bfbdaf425526cf3556704f6b9fd0971 (patch)
treec1659854546676c402a25679b8236ec467a6ef3d /src/symbol.c
parentd04f6abb00051465f59be4cda54e593a64923f8e (diff)
parentfc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff)
downloadmruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz
mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip
resolve conflict regarding backtick
Diffstat (limited to 'src/symbol.c')
-rw-r--r--src/symbol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/symbol.c b/src/symbol.c
index 6afc6b7a6..243cb4b5d 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -62,7 +62,7 @@ mrb_intern2(mrb_state *mrb, const char *name, size_t len)
}
mrb_sym
-mrb_intern(mrb_state *mrb, const char *name)
+mrb_intern_cstr(mrb_state *mrb, const char *name)
{
return mrb_intern2(mrb, name, strlen(name));
}