[ros-diffs] [royce] 13920: fix gcc4 warnings

fix gcc4 warnings
Modified: trunk/reactos/tools/unicode/mbtowc.c
Modified: trunk/reactos/tools/unicode/wctomb.c
  _____  

Modified: trunk/reactos/tools/unicode/mbtowc.c
--- trunk/reactos/tools/unicode/mbtowc.c	2005-03-10 22:59:28 UTC
(rev 13919)
+++ trunk/reactos/tools/unicode/mbtowc.c	2005-03-11 02:37:30 UTC
(rev 13920)
@@ -22,6 +22,8 @@

 
 #include "wine/unicode.h"
 
+typedef unsigned char uchar;
+
 /* get the decomposition of a Unicode char */
 int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
 {
@@ -256,25 +258,25 @@
     {
         if (flags & MB_ERR_INVALID_CHARS)
         {
-            if (check_invalid_chars_sbcs( &table->sbcs, src, srclen ))
return -2;
+            if (check_invalid_chars_sbcs( &table->sbcs, (const
uchar*)src, srclen )) return -2;
         }
         if (!(flags & MB_COMPOSITE))
         {
             if (!dstlen) return srclen;
-            return mbstowcs_sbcs( &table->sbcs, src, srclen, dst,
dstlen );
+            return mbstowcs_sbcs( &table->sbcs, (const uchar*)src,
srclen, dst, dstlen );
         }
-        return mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst,
dstlen );
+        return mbstowcs_sbcs_decompose( &table->sbcs, (const
uchar*)src, srclen, dst, dstlen );
     }
     else /* mbcs */
     {
         if (flags & MB_ERR_INVALID_CHARS)
         {
-            if (check_invalid_chars_dbcs( &table->dbcs, src, srclen ))
return -2;
+            if (check_invalid_chars_dbcs( &table->dbcs, (const
uchar*)src, srclen )) return -2;
         }
         if (!(flags & MB_COMPOSITE))
-            return mbstowcs_dbcs( &table->dbcs, src, srclen, dst,
dstlen );
+            return mbstowcs_dbcs( &table->dbcs, (const uchar*)src,
srclen, dst, dstlen );
         else
-            return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen,
dst, dstlen );
+            return mbstowcs_dbcs_decompose( &table->dbcs, (const
uchar*)src, srclen, dst, dstlen );
     }
 }
 
  _____  

Modified: trunk/reactos/tools/unicode/wctomb.c
--- trunk/reactos/tools/unicode/wctomb.c	2005-03-10 22:59:28 UTC
(rev 13919)
+++ trunk/reactos/tools/unicode/wctomb.c	2005-03-11 02:37:30 UTC
(rev 13920)
@@ -196,7 +196,7 @@

     int tmp;
     WCHAR composed;
 
-    if (!defchar) defchar = &table_default;
+    if (!defchar) defchar = (const char*)&table_default;
     if (!used) used = &tmp;  /* avoid checking on every char */
     *used = 0;