summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorTomoyuki Sahara <[email protected]>2013-03-13 09:56:02 +0900
committerTomoyuki Sahara <[email protected]>2013-03-13 09:56:02 +0900
commitb67fb972f4a2dbc0f799bf71d1ef1c7b959fb3c2 (patch)
tree2e05af92845e8954fda7d5a156ce86ff32c63055 /include
parent7103e032746df1b4359f6e6a6bb117ad7a434aa1 (diff)
parent2134d6b4273988c06eadeea737c8cd425550e572 (diff)
downloadmruby-b67fb972f4a2dbc0f799bf71d1ef1c7b959fb3c2.tar.gz
mruby-b67fb972f4a2dbc0f799bf71d1ef1c7b959fb3c2.zip
Merge branch 'master' into pr-systemcallerror
Diffstat (limited to 'include')
-rw-r--r--include/mruby/string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mruby/string.h b/include/mruby/string.h
index 4ba4ce544..9e6de485d 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -68,7 +68,7 @@ mrb_value mrb_str_buf_append(mrb_state *mrb, mrb_value str, mrb_value str2);
mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
int mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2);
mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
-mrb_value mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, long len);
+mrb_value mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, mrb_int len);
mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2);