summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-08-22 07:35:51 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-08-22 07:35:51 +0900
commit3f90af6b4263dfc99d513d228a00e62543f22464 (patch)
treec50c04ccbb59193fbcaa56d62be2e0c96b7d2df4
parenta7d611fb23e26cabf859aadcf5fc476f64054c3d (diff)
downloadmruby-3f90af6b4263dfc99d513d228a00e62543f22464.tar.gz
mruby-3f90af6b4263dfc99d513d228a00e62543f22464.zip
(Try to) fix mixture of `int` and `size_t` in UTF-8 conversion.
This only effects VC.
-rw-r--r--include/mruby.h4
-rw-r--r--src/string.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 18f54fd2f..556dc41e8 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -952,8 +952,8 @@ MRB_API mrb_value mrb_str_new_static(mrb_state *mrb, const char *p, size_t len);
#define mrb_str_new_lit(mrb, lit) mrb_str_new_static(mrb, (lit), mrb_strlen_lit(lit))
#ifdef _WIN32
-char* mrb_utf8_from_locale(const char *p, size_t len);
-char* mrb_locale_from_utf8(const char *p, size_t len);
+char* mrb_utf8_from_locale(const char *p, int len);
+char* mrb_locale_from_utf8(const char *p, int len);
#define mrb_locale_free(p) free(p)
#define mrb_utf8_free(p) free(p)
#else
diff --git a/src/string.c b/src/string.c
index c2526f354..7f826ab1d 100644
--- a/src/string.c
+++ b/src/string.c
@@ -577,11 +577,11 @@ mrb_str_strlen(mrb_state *mrb, struct RString *s)
#include <windows.h>
char*
-mrb_utf8_from_locale(const char *str, size_t len)
+mrb_utf8_from_locale(const char *str, int len)
{
wchar_t* wcsp;
char* mbsp;
- size_t mbssize, wcssize;
+ int mbssize, wcssize;
if (len == 0)
return strdup("");
@@ -607,11 +607,11 @@ mrb_utf8_from_locale(const char *str, size_t len)
}
char*
-mrb_locale_from_utf8(const char *utf8, size_t len)
+mrb_locale_from_utf8(const char *utf8, int len)
{
wchar_t* wcsp;
char* mbsp;
- size_t mbssize, wcssize;
+ int mbssize, wcssize;
if (len == 0)
return strdup("");