Changeset 21927 for trunk/lib/unicode/string.c

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.

File:

• trunk/lib/unicode/string.c (modified) (8 diffs)

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;