[ros-diffs] [royce] 12795: fix gcc incompatibilities

fix gcc incompatibilities
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp
2005-01-04 18:38:31 UTC (rev 12794)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp
2005-01-04 19:06:48 UTC (rev 12795)
@@ -1035,7 +1035,7 @@

 	return true;
 }
 
-static int string(std::string& f, const char* s, int len, int
field_width, int precision, int flags)
+static int do_string(std::string& f, const char* s, int len, int
field_width, int precision, int flags)
 {
 	int i, done = 0;
 	if (s == NULL)
@@ -1076,7 +1076,7 @@
 	return done;
 }
 
-static int wstring(std::wstring& f, const wchar_t* s, int len, int
field_width, int precision, int flags)
+static int do_wstring(std::wstring& f, const wchar_t* s, int len, int
field_width, int precision, int flags)
 {
 	int i, done = 0;
 	if (s == NULL)
@@ -1226,7 +1226,7 @@
 	long double _ldouble;
 	double _double;
 	const char *s;
-	const unsigned short* sw;
+	const wchar_t* sw;
 	int result;
 	std::string f;
 
@@ -1370,7 +1370,7 @@
 			} else {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width,
precision, flags);
+				result = do_string(f, s, -1,
field_width, precision, flags);
 			}
 			if (result < 0)
 			{
@@ -1383,7 +1383,7 @@
 			if (qualifier == 'h') {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width,
precision, flags);
+				result = do_string(f, s, -1,
field_width, precision, flags);
 			} else {
 				/* print unicode string */
 				sw = va_arg(args, wchar_t *);
@@ -1720,7 +1720,7 @@
 			} else {
 				/* print unicode string */
 				s = va_arg(args, wchar_t *);
-				result = wstring(f, s, -1, field_width,
precision, flags);
+				result = do_wstring(f, s, -1,
field_width, precision, flags);
 			}
 			if (result < 0)
 			{
@@ -1733,7 +1733,7 @@
 			if (qualifier == L'l' || qualifier == L'w') {
 				/* print unicode string */
 				s = va_arg(args, wchar_t *);
-				result = wstring(f, s, -1, field_width,
precision, flags);
+				result = do_wstring(f, s, -1,
field_width, precision, flags);
 			} else {
 				/* print ascii string */
 				sa = va_arg(args, char *);