Make use internal str*casecmp/wcscoll

3 files changed, 5 insertions, 2 deletions

diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index bf8958a66..789e78b49 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -54,6 +54,8 @@ extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/;
 #define strlen __strlen
 #define strncpy __strncpy
 #define getenv __getenv
+#define strcasecmp __strcasecmp
+#define wcscoll __wcscoll
 
 extern void *__mempcpy (void *__restrict __dest,
 			__const void *__restrict __src, size_t __n) /*attribute_hidden*/;
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index 69b77c4c3..486e29c40 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -28,6 +28,7 @@
 #define wcslen __wcslen
 /* for some reason this does not work */
 #define memcpy __memcpy
+#define wcscoll __wcscoll
 
 /* To exclude some unwanted junk.... */
 #undef _LIBC
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 1691e00e0..9f3da8626 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1267,7 +1267,7 @@ static int find_codeset(const char *name)
 	int codeset;
 
 	for (s = __iconv_codesets ; *s ; s += *s) {
-		if (!strcasecmp(s+2, name)) {
+		if (!__strcasecmp(s+2, name)) {
 			return s[1];
 		}
 	}
@@ -1280,7 +1280,7 @@ static int find_codeset(const char *name)
 	s = __LOCALE_DATA_CODESET_LIST;
 	do {
 		++codeset;		/* Increment codeset first. */
-		if (!strcasecmp(__LOCALE_DATA_CODESET_LIST+*s, name)) {
+		if (!__strcasecmp(__LOCALE_DATA_CODESET_LIST+*s, name)) {
 			return codeset;
 		}
 	} while (*++s);