Changeset 21927 for trunk/lib/unicode

Timestamp:

Dec 23, 2011, 7:16:58 PM (14 years ago)

Author:

dmik

Message:

Fix build breaks with the newest GCC 4.4.6 from GIT.

In particular, GCC is now strict about matching the calling convention
of the prototype (argument) and the real function used.

Location:

trunk/lib/unicode

Files:

• cptable.c (modified) (2 diffs)
• mbtowc.c (modified) (1 diff)
• string.c (modified) (8 diffs)
• utf8.c (modified) (2 diffs)
• wctomb.c (modified) (1 diff)

trunk/lib/unicode/cptable.c

@@ -150 +150 @@
 
 /* get the table of a given code page */
-const union cptable *cp_get_table( unsigned int codepage )
+_K32CONV const union cptable *cp_get_table( unsigned int codepage )
 {
     const union cptable **res;
@@ -166 +166 @@
 
 /* enum valid codepages */
-const union cptable *cp_enum_table( unsigned int index )
+_K32CONV const union cptable *cp_enum_table( unsigned int index )
 {
     if (index >= NB_CODEPAGES) return NULL;

trunk/lib/unicode/mbtowc.c

@@ -236 +236 @@
 
 /* return -1 on dst buffer overflow, -2 on invalid input char */
-int cp_mbstowcs( const union cptable *table, int flags,
-                 const char *src, int srclen,
-                 WCHAR *dst, int dstlen )
+_K32CONV int cp_mbstowcs( const union cptable *table, int flags,
+                          const char *src, int srclen,
+                          WCHAR *dst, int dstlen )
 {
     if (NULL == src) return -2;

trunk/lib/unicode/string.c

@@ -12 +12 @@
 #include "wine/unicode.h"
 
-int strcmpiW( const WCHAR *str1, const WCHAR *str2 )
+_K32CONV int strcmpiW( const WCHAR *str1, const WCHAR *str2 )
 {
     for (;;)
@@ -23 +23 @@
 }
 
-int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n )
+_K32CONV int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n )
 {
     int ret = 0;
@@ -31 +31 @@
 }
 
-WCHAR *strstrW( const WCHAR *str, const WCHAR *sub )
+_K32CONV WCHAR *strstrW( const WCHAR *str, const WCHAR *sub )
 {
     while (*str)
@@ -46 +46 @@
 /* Copyright (C) 1991,92,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. */
 
-long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base )
+_K32CONV long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base )
 {
   int negative;
@@ -165 +165 @@
 }
 
-unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base )
+_K32CONV unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base )
 {
   int negative;
@@ -276 +276 @@
 }
 
-int vsnprintfW(WCHAR *str, unsigned int len, const WCHAR *format, va_list valist)
+_K32CONV int vsnprintfW(WCHAR *str, unsigned int len, const WCHAR *format, va_list valist)
 {
     unsigned int written = 0;
@@ -395 +395 @@
 
 
-int snprintfW(WCHAR *str, unsigned int len, const WCHAR *format, ...)
+_K32CONV int snprintfW(WCHAR *str, unsigned int len, const WCHAR *format, ...)
 {
     int retval;
@@ -405 +405 @@
 }
 
-int sprintfW( WCHAR *str, const WCHAR *format, ...)
+_K32CONV int sprintfW( WCHAR *str, const WCHAR *format, ...)
 {
     int retval;

trunk/lib/unicode/utf8.c

@@ -47 +47 @@
 /* wide char to UTF-8 string conversion */
 /* return -1 on dst buffer overflow */
-int utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen )
+_K32CONV int utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen )
 {
     int ret = srclen;
@@ -127 +127 @@
 /* UTF-8 to wide char string conversion */
 /* return -1 on dst buffer overflow, -2 on invalid input char */
-int utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen )
+_K32CONV int utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen )
 {
     int len, count;

trunk/lib/unicode/wctomb.c

@@ -378 +378 @@
 /* wide char to multi byte string conversion */
 /* return -1 on dst buffer overflow */
-int cp_wcstombs( const union cptable *table, int flags,
+_K32CONV int cp_wcstombs( const union cptable *table, int flags,
                  const WCHAR *src, int srclen,
                  char *dst, int dstlen, const char *defchar, int *used )