Merge

3 files changed, 9 insertions, 9 deletions

diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index e59a6f59dbb..119443a0c95 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -224,7 +224,7 @@ int my_strnncoll_sjis(const uchar *s1, int len1, const uchar *s2, int len2)
 
 int my_strcoll_sjis(const uchar *s1, const uchar *s2)
 {
-  return my_strnncoll_sjis(s1, strlen(s1), s2, strlen(s2));
+  return (uint) my_strnncoll_sjis(s1,(uint) strlen(s1), s2,(uint) strlen(s2));
 }
 
 int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
@@ -245,7 +245,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
 
 int my_strxfrm_sjis(uchar *dest, uchar *src, int len)
 {
-  return my_strnxfrm_sjis(dest, src, len, strlen(src));
+  return my_strnxfrm_sjis(dest, src, len, (uint) strlen(src));
 }
 
 
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index bc80819c2a9..a495f15c846 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -12,7 +12,7 @@
 */
 
 
-/* $Id$
+/*
    This file is basicly tis620 character sets with some extra functions
    for tis-620 handling
 */
@@ -443,7 +443,7 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
   uint	bufSize;
 
   len = (uint) strnlen((char*) tstr,len);
-  bufSize = buffsize((char*) tstr);
+  bufSize = (uint) buffsize((char*) tstr);
   if(!(pRight1 = (uchar *)malloc(sizeof(uchar) * bufSize))) {
     return( (uchar*) tstr);
   }
@@ -530,7 +530,7 @@ int my_strnxfrm_tis620(uchar * dest, uchar * src, int len, int srclen)
 {
   uint bufSize;
   uchar *tmp;
-  bufSize = buffsize((char*)src);
+  bufSize = (uint) buffsize((char*)src);
   tmp = thai2sortable(src,srclen);
   set_if_smaller(bufSize,(uint) len);
   memcpy((uchar *)dest, tmp, bufSize);
@@ -563,7 +563,7 @@ int my_strxfrm_tis620(uchar * dest, uchar * src, int len)
   uint bufSize;
   uchar *tmp;
 
-  bufSize = buffsize((char*) src);
+  bufSize = (uint) buffsize((char*) src);
   tmp = thai2sortable(src, len);
   memcpy((uchar *) dest, tmp, bufSize);
   free(tmp);
@@ -586,7 +586,7 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape,
   uint tbuff_length;
 
   tbuff = (char*) (tc=thai2sortable((uchar*) ptr, ptr_length));
-  tbuff_length = buffsize(ptr);
+  tbuff_length = (uint) buffsize(ptr);
   end = tbuff + tbuff_length;
   for(;tbuff != end && min_str != min_end; tbuff++)
   {
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index f60e6d98272..6aca3fa911c 100644
--- a/strings/t_ctype.h
+++ b/strings/t_ctype.h
@@ -9,8 +9,8 @@
     "as is" without express or implied warranty.
 */
 
-/* $Id$
-   LC_COLLATE category + Level information
+/*
+  LC_COLLATE category + Level information
 */
 
 #ifndef _t_ctype_h