fixes for windows 64-bit compiler warnings

heap/hp_hash.c:
  fix for windows 64-bit compiler warnings
heap/hp_update.c:
  fix for windows 64-bit compiler warnings
mysys/default.c:
  fix for windows 64-bit compiler warnings
mysys/default_modify.c:
  fix for windows 64-bit compiler warnings
mysys/mf_iocache.c:
  fix for windows 64-bit compiler warnings
mysys/mf_keycache.c:
  fix for windows 64-bit compiler warnings
mysys/my_alloc.c:
  fix for windows 64-bit compiler warnings
mysys/my_getopt.c:
  fix for windows 64-bit compiler warnings
mysys/my_mmap.c:
  fix for windows 64-bit compiler warnings
mysys/my_once.c:
  fix for windows 64-bit compiler warnings
mysys/string.c:
  fix for windows 64-bit compiler warnings
sql-common/client.c:
  fix for windows 64-bit compiler warnings
sql/field.cc:
  fix for windows 64-bit compiler warnings
sql/gstream.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisam.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisammrg.cc:
  fix for windows 64-bit compiler warnings
sql/item.cc:
  fix for windows 64-bit compiler warnings
sql/item.h:
  fix for windows 64-bit compiler warnings
sql/item_cmpfunc.cc:
  fix for windows 64-bit compiler warnings
sql/password.c:
  fix for windows 64-bit compiler warnings
sql/set_var.h:
  fix for windows 64-bit compiler warnings
strings/ctype-big5.c:
  fix for windows 64-bit compiler warnings
strings/ctype-bin.c:
  fix for windows 64-bit compiler warnings
strings/ctype-cp932.c:
  fix for windows 64-bit compiler warnings
strings/ctype-eucjpms.c:
  fix for windows 64-bit compiler warnings
strings/ctype-mb.c:
  fix for windows 64-bit compiler warnings
strings/ctype-simple.c:
  fix for windows 64-bit compiler warnings
strings/ctype-sjis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-uca.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ucs2.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ujis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-utf8.c:
  fix for windows 64-bit compiler warnings
strings/ctype.c:
  fix for windows 64-bit compiler warnings
strings/decimal.c:
  fix for windows 64-bit compiler warnings
strings/xml.c:
  fix for windows 64-bit compiler warnings

1 files changed, 12 insertions, 12 deletions

diff --git a/strings/xml.c b/strings/xml.c
index d19c3dab241..17f1b400957 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -148,7 +148,7 @@ static int my_xml_enter(MY_XML_PARSER *st, const char *str, uint len)
   memcpy(st->attrend,str,len);
   st->attrend+=len;
   st->attrend[0]='\0';
-  return st->enter ? st->enter(st,st->attr,st->attrend-st->attr) : MY_XML_OK;
+  return st->enter ?  st->enter(st,st->attr,st->attrend-st->attr) : MY_XML_OK;
 }
 
 
@@ -170,7 +170,7 @@ static int my_xml_leave(MY_XML_PARSER *p, const char *str, uint slen)
   
   /* Find previous '.' or beginning */
   for( e=p->attrend; (e>p->attr) && (e[0]!='.') ; e--);
-  glen = (e[0]=='.') ? (p->attrend-e-1) : p->attrend-e;
+  glen = (uint) ((e[0]=='.') ? (p->attrend-e-1) : p->attrend-e);
   
   if (str && (slen != glen))
   {
@@ -180,7 +180,7 @@ static int my_xml_leave(MY_XML_PARSER *p, const char *str, uint slen)
     return MY_XML_ERROR;
   }
   
-  rc = p->leave_xml ? p->leave_xml(p,p->attr,p->attrend-p->attr) : MY_XML_OK;
+  rc = p->leave_xml ?  p->leave_xml(p,p->attr,p->attrend-p->attr) : MY_XML_OK;
   
   *e='\0';
   p->attrend=e;
@@ -221,7 +221,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
           sprintf(p->errstr,"1: %s unexpected (ident wanted)",lex2str(lex));
           return MY_XML_ERROR;
         }
-        if(MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg))
+        if(MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
         lex=my_xml_scan(p,&a);
         goto gt;
@@ -240,7 +240,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
       
       if (MY_XML_IDENT==lex)
       {
-        if(MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg))
+        if(MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
       }
       else
@@ -258,9 +258,9 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
           lex=my_xml_scan(p,&b);
           if ( (lex==MY_XML_IDENT) || (lex==MY_XML_STRING) )
           {
-            if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg))  ||
-               (MY_XML_OK!=my_xml_value(p,b.beg,b.end-b.beg))  ||
-               (MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg)))
+            if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))  ||
+               (MY_XML_OK!=my_xml_value(p,b.beg,(uint) (b.end-b.beg)))  ||
+               (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
               return MY_XML_ERROR;
           }
           else
@@ -272,8 +272,8 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
         }
         else if ( (MY_XML_STRING==lex) || (MY_XML_IDENT==lex) )
         {
-          if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg)) ||
-             (MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg)))
+          if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg))) ||
+             (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
            return MY_XML_ERROR;
         }
         else
@@ -321,7 +321,7 @@ gt:
       my_xml_norm_text(&a);
       if (a.beg!=a.end)
       {
-        my_xml_value(p,a.beg,a.end-a.beg);
+        my_xml_value(p,a.beg,(uint) (a.end-a.beg));
       }
     }
   }
@@ -384,7 +384,7 @@ uint my_xml_error_pos(MY_XML_PARSER *p)
     if (s[0]=='\n')
       beg=s;
   }
-  return p->cur-beg;
+  return (uint) (p->cur-beg);
 }
 
 uint my_xml_error_lineno(MY_XML_PARSER *p)