Sync to Wine-20050628:

Eric Pouech <pouech-eric@wanadoo.fr>
- Const correctness fixes.
Mike McCormack <mike@codeweavers.com>
- Fix some declaration and write string warnings.

svn path=/trunk/; revision=16436

diff --git a/reactos/tools/unicode/cptable.c b/reactos/tools/unicode/cptable.c
index ce5d6cf..58574b2 100644 (file)
--- a/reactos/tools/unicode/cptable.c
+++ b/reactos/tools/unicode/cptable.c
@@ -156,7 +156,7 @@ static const union cptable * const cptables[60] =
 
 static int cmp_codepage( const void *codepage, const void *entry )
 {
-    return (unsigned int)codepage - (*(const union cptable **)entry)->info.codepage;
+    return (unsigned int)codepage - (*(const union cptable *const *)entry)->info.codepage;
 }
 
 

diff --git a/reactos/tools/unicode/mbtowc.c b/reactos/tools/unicode/mbtowc.c
index 1c85b24..71c74fd 100644 (file)
--- a/reactos/tools/unicode/mbtowc.c
+++ b/reactos/tools/unicode/mbtowc.c
@@ -25,7 +25,7 @@
 typedef unsigned char uchar;
 
 /* get the decomposition of a Unicode char */
-int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
+static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
 {
     extern const WCHAR unicode_decompose_table[];
     const WCHAR *ptr = unicode_decompose_table;