Merge r2511:
Add two more cases where wcscmp is needed. From Hauke Fath

SVN-Revision: 2512
diff --git a/cpio/test/main.c b/cpio/test/main.c
index a8b6814..90336a9 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -489,6 +489,22 @@
 	logprintf("\"\n");
 }
 
+#ifndef HAVE_WCSCMP
+static int
+wcscmp(const wchar_t *s1, const wchar_t *s2)
+{
+
+	while (*s1 == *s2++) {
+		if (*s1++ == L'\0')
+			return 0;
+	}
+	if (*s1 > *--s2)
+		return 1;
+	else
+		return -1;
+}
+#endif
+
 /* Verify that two wide strings are equal, dump them if not. */
 int
 assertion_equal_wstring(const char *file, int line,
diff --git a/tar/test/main.c b/tar/test/main.c
index 6028d77..4f8309e 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -490,6 +490,22 @@
 	logprintf("\"\n");
 }
 
+#ifndef HAVE_WCSCMP
+static int
+wcscmp(const wchar_t *s1, const wchar_t *s2)
+{
+
+	while (*s1 == *s2++) {
+		if (*s1++ == L'\0')
+			return 0;
+	}
+	if (*s1 > *--s2)
+		return 1;
+	else
+		return -1;
+}
+#endif
+
 /* Verify that two wide strings are equal, dump them if not. */
 int
 assertion_equal_wstring(const char *file, int line,