diff options
author | georg@lmy002.wdf.sap.corp <> | 2005-06-13 12:41:15 +0200 |
---|---|---|
committer | georg@lmy002.wdf.sap.corp <> | 2005-06-13 12:41:15 +0200 |
commit | b64e6db5a4d6807fe693c22b5b743968264a83dc (patch) | |
tree | 0a4d130bc8c5eb5d2582f3864b50584de7a5647f /strings/ctype-simple.c | |
parent | 55f962c0cfff56ce5d9e0639072fdd65541ea471 (diff) | |
download | mariadb-git-b64e6db5a4d6807fe693c22b5b743968264a83dc.tar.gz |
fixes for windows 64-bit compiler warnings
Diffstat (limited to 'strings/ctype-simple.c')
-rw-r--r-- | strings/ctype-simple.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 6ed1af846ec..fe514186deb 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -1084,7 +1084,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq) if (*str == '.') { for(str++ ; str != end && *str == '0' ; str++); - return str-str0; + return (ulong) (str-str0); } return 0; @@ -1094,7 +1094,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq) if (!my_isspace(cs,*str)) break; } - return str-str0; + return (ulong) (str-str0); default: return 0; } @@ -1111,14 +1111,14 @@ void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)), uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)), const char *b, const char *e) { - return e-b; + return (uint) (e-b); } uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)), const char *b, const char *e) { - return e-b; + return (uint) (e-b); } @@ -1193,7 +1193,7 @@ skip: if (nmatch > 0) { match[0].beg= 0; - match[0].end= str- (const uchar*)b-1; + match[0].end= (uint) (str- (const uchar*)b-1); match[0].mblen= match[0].end; if (nmatch > 1) |