summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-08-05 16:32:52 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-08-05 16:32:52 +0900
commitfce644df5913ca680c304e48e36eea915e386ab1 (patch)
tree839c355448168a6eb92dfd80da877f7522a65fdb
parente41fd5c0d6417f50866acd8e7505b4a3d3d6e79e (diff)
parent412b9eb827ead65f02c1e8e216dbd475b6b644a5 (diff)
downloadmruby-fce644df5913ca680c304e48e36eea915e386ab1.tar.gz
mruby-fce644df5913ca680c304e48e36eea915e386ab1.zip
Merge pull request #2508 from iij/pr-mrb-str-to-cstr-returns-mutable
revert accidental constify.
-rw-r--r--include/mruby/string.h2
-rw-r--r--src/string.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mruby/string.h b/include/mruby/string.h
index abc7ac0fc..0bd4cfc0f 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -101,7 +101,7 @@ MRB_API mrb_value mrb_str_cat_str(mrb_state *mrb, mrb_value str, mrb_value str2)
MRB_API mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
MRB_API int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2);
-MRB_API const char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
+MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
mrb_value mrb_str_pool(mrb_state *mrb, mrb_value str);
mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str);
mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
diff --git a/src/string.c b/src/string.c
index 8ac5a436a..66777d9e5 100644
--- a/src/string.c
+++ b/src/string.c
@@ -306,7 +306,7 @@ mrb_gc_free_str(mrb_state *mrb, struct RString *str)
mrb_free(mrb, str->as.heap.ptr);
}
-MRB_API const char*
+MRB_API char*
mrb_str_to_cstr(mrb_state *mrb, mrb_value str0)
{
struct RString *s;