fix gcc incompatibilities

svn path=/branches/xmlbuildsystem/; revision=12795

diff --git a/reactos/tools/rbuild/ssprintf.cpp b/reactos/tools/rbuild/ssprintf.cpp
index 5b0e713..468a5ae 100644 (file)
--- a/reactos/tools/rbuild/ssprintf.cpp
+++ b/reactos/tools/rbuild/ssprintf.cpp
@@ -1035,7 +1035,7 @@ static bool wnumberfl(std::wstring& f, long double __n, wchar_t exp_sign,  int s
        return true;\r
 }\r
 \r
-static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags)\r
+static int do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags)\r
 {\r
        int i, done = 0;\r
        if (s == NULL)\r
@@ -1076,7 +1076,7 @@ static int string(std::string& f, const char* s, int len, int field_width, int p
        return done;\r
 }\r
 \r
-static int wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags)\r
+static int do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags)\r
 {\r
        int i, done = 0;\r
        if (s == NULL)\r
@@ -1226,7 +1226,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
        long double _ldouble;\r
        double _double;\r
        const char *s;\r
-       const unsigned short* sw;\r
+       const wchar_t* sw;\r
        int result;\r
        std::string f;\r
 \r
@@ -1370,7 +1370,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
                        } else {\r
                                /* print ascii string */\r
                                s = va_arg(args, char *);\r
-                               result = string(f, s, -1, field_width, precision, flags);\r
+                               result = do_string(f, s, -1, field_width, precision, flags);\r
                        }\r
                        if (result < 0)\r
                        {\r
@@ -1383,7 +1383,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
                        if (qualifier == 'h') {\r
                                /* print ascii string */\r
                                s = va_arg(args, char *);\r
-                               result = string(f, s, -1, field_width, precision, flags);\r
+                               result = do_string(f, s, -1, field_width, precision, flags);\r
                        } else {\r
                                /* print unicode string */\r
                                sw = va_arg(args, wchar_t *);\r
@@ -1720,7 +1720,7 @@ std::wstring sswvprintf ( const wchar_t* fmt, va_list args )
                        } else {\r
                                /* print unicode string */\r
                                s = va_arg(args, wchar_t *);\r
-                               result = wstring(f, s, -1, field_width, precision, flags);\r
+                               result = do_wstring(f, s, -1, field_width, precision, flags);\r
                        }\r
                        if (result < 0)\r
                        {\r
@@ -1733,7 +1733,7 @@ std::wstring sswvprintf ( const wchar_t* fmt, va_list args )
                        if (qualifier == L'l' || qualifier == L'w') {\r
                                /* print unicode string */\r
                                s = va_arg(args, wchar_t *);\r
-                               result = wstring(f, s, -1, field_width, precision, flags);\r
+                               result = do_wstring(f, s, -1, field_width, precision, flags);\r
                        } else {\r
                                /* print ascii string */\r
                                sa = va_arg(args, char *);\r