From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 11 Mar 2005 02:37:30 +0000 (+0000)
Subject: fix gcc4 warnings
X-Git-Tag: backups/alex_devel_branch@15093^2~12
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=7b9b41e3041cf42127da18164b61e4f02be2a668

fix gcc4 warnings

svn path=/trunk/; revision=13920
---

diff --git a/reactos/tools/unicode/mbtowc.c b/reactos/tools/unicode/mbtowc.c
index dd3c9242d37..1c85b2429d8 100644
--- a/reactos/tools/unicode/mbtowc.c
+++ b/reactos/tools/unicode/mbtowc.c
@@ -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 @@ int wine_cp_mbstowcs( const union cptable *table, int flags,
     {
         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 );
     }
 }
 
diff --git a/reactos/tools/unicode/wctomb.c b/reactos/tools/unicode/wctomb.c
index 68be134e7ae..aed43031f67 100644
--- a/reactos/tools/unicode/wctomb.c
+++ b/reactos/tools/unicode/wctomb.c
@@ -196,7 +196,7 @@ static int wcstombs_sbcs_slow( const struct sbcs_table *table, int flags,
     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;