summaryrefslogtreecommitdiff
path: root/strings/ctype-ucs2.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-01-12 18:25:02 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-01-26 10:37:46 +0000
commit9891ee5a2aadd2672d8d7f6b217e852344ff86eb (patch)
tree2f5950ed243a10e36e1d8b9609c6426946fe9011 /strings/ctype-ucs2.c
parent859d100d70a9dba222b229bbc0d5a01194e8ed5f (diff)
downloadmariadb-git-9891ee5a2aadd2672d8d7f6b217e852344ff86eb.tar.gz
Fix and reenable Windows compiler warning C4800 (size_t conversion).
Diffstat (limited to 'strings/ctype-ucs2.c')
-rw-r--r--strings/ctype-ucs2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index cba44afc926..80bb6745b19 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1078,7 +1078,7 @@ my_fill_mb2(CHARSET_INFO *cs, char *s, size_t slen, int fill)
}
-static int
+static size_t
my_vsnprintf_mb2(char *dst, size_t n, const char* fmt, va_list ap)
{
char *start=dst, *end= dst + n - 1;
@@ -2327,7 +2327,7 @@ my_charlen_utf32(CHARSET_INFO *cs __attribute__((unused)),
/* Defines my_well_formed_char_length_utf32 */
-static int
+static size_t
my_vsnprintf_utf32(char *dst, size_t n, const char* fmt, va_list ap)
{
char *start= dst, *end= dst + n;