From 3f90af6b4263dfc99d513d228a00e62543f22464 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 22 Aug 2017 07:35:51 +0900 Subject: (Try to) fix mixture of `int` and `size_t` in UTF-8 conversion. This only effects VC. --- include/mruby.h | 4 ++-- src/string.c | 8 ++++---- 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 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(""); -- cgit v1.2.3