From cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 25 Feb 2006 04:03:33 +0000
Subject: Merge from trunk. Going pretty good so far. Kind of. Okay, not
 really.

---
 libc/string/strcmp.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'libc/string/strcmp.c')

diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c
index 1fb8625ff..4a95ab882 100644
--- a/libc/string/strcmp.c
+++ b/libc/string/strcmp.c
@@ -8,14 +8,16 @@
 #include "_string.h"
 
 #ifdef WANT_WIDE
-# define __Wstrcmp __wcscmp
 # define Wstrcmp wcscmp
+# define Wstrcoll wcscoll
 #else
-# define __Wstrcmp __strcmp
 # define Wstrcmp strcmp
+# define Wstrcoll strcoll
 #endif
 
-int attribute_hidden __Wstrcmp(register const Wchar *s1, register const Wchar *s2)
+libc_hidden_proto(Wstrcmp)
+
+int Wstrcmp(register const Wchar *s1, register const Wchar *s2)
 {
 #ifdef WANT_WIDE
 	while (*((Wuchar *)s1) == *((Wuchar *)s2)) {
@@ -35,15 +37,10 @@ int attribute_hidden __Wstrcmp(register const Wchar *s1, register const Wchar *s
 	return r;
 #endif
 }
-
-strong_alias(__Wstrcmp,Wstrcmp)
+libc_hidden_def(Wstrcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-# ifdef WANT_WIDE
-hidden_strong_alias(__wcscmp,__wcscoll)
-strong_alias(__wcscmp,wcscoll)
-# else
-hidden_strong_alias(__strcmp,__strcoll)
-strong_alias(__strcmp,strcoll)
-# endif
+libc_hidden_proto(Wstrcoll)
+strong_alias(Wstrcmp,Wstrcoll)
+libc_hidden_def(Wstrcoll)
 #endif
-- 
cgit v1.2.3