[Mockpp-commits] mockpp/mockpp/compat Assert.cpp,1.22,1.23

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31668/mockpp/compat

Modified Files:
	Assert.cpp 
Log Message:
fixes for cygwin (unicode+ascii)

Index: Assert.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Assert.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Assert.cpp	30 Dec 2004 20:54:04 -0000	1.22
+++ Assert.cpp	2 Apr 2005 13:46:30 -0000	1.23
@@ -43,7 +43,7 @@
 /* Compare S1 and S2, returning less than, equal to or
    greater than zero if S1 is lexicographically less than,
    equal to or greater than S2.	 */
-int
+static int
 wcscmp (const wchar_t  *s1, const wchar_t *s2)
 {
   wchar_t c1, c2;
@@ -146,7 +146,7 @@
                                 const wchar_t *expected,
                                 const wchar_t *actual)
 {
-#if defined(_MSC_VER) || !defined(HAVE_WCSCMP)
+#if !defined(HAVE_STD_WCSCMP)
   if (wcscmp(expected, actual) != 0)
 #else
   if (std::wcscmp(expected, actual) != 0)