From d8ea341e64250c2f4636c559562e8904037eda74 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 26 Nov 2008 01:21:10 +0000
Subject: libc/string: need additional work to remove libc_hidden_proto's
 properly

---
 libc/string/strlcpy.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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

diff --git a/libc/string/strlcpy.c b/libc/string/strlcpy.c
index 4bdf0daa6..0ccfc0e8a 100644
--- a/libc/string/strlcpy.c
+++ b/libc/string/strlcpy.c
@@ -9,14 +9,10 @@
 
 #ifdef WANT_WIDE
 # define Wstrlcpy __wcslcpy
-# define Wstrxfrm wcsxfrm
 #else
-/* Experimentally off - libc_hidden_proto(strlcpy) */
 # define Wstrlcpy strlcpy
-# define Wstrxfrm strxfrm
 #endif
 
-
 /* OpenBSD function:
  * Copy at most n-1 chars from src to dst and nul-terminate dst.
  * Returns strlen(src), so truncation occurred if the return value is >= n. */
@@ -49,16 +45,19 @@ size_t Wstrlcpy(register Wchar *__restrict dst,
 
 	return src - src0;
 }
-#ifndef WANT_WIDE
-libc_hidden_def(strlcpy)
+#ifdef WANT_WIDE
+
 #ifndef __UCLIBC_HAS_LOCALE__
-/* Experimentally off - libc_hidden_proto(strxfrm) */
-strong_alias(strlcpy,strxfrm)
-libc_hidden_def(strxfrm)
+strong_alias(__wcslcpy,wcsxfrm)
+libc_hidden_def(wcsxfrm)
 #endif
+
 #else
+
+libc_hidden_def(strlcpy)
 #ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(__wcslcpy,wcsxfrm)
-libc_hidden_def(wcsxfrm)
+strong_alias(strlcpy,strxfrm)
+libc_hidden_def(strxfrm)
 #endif
+
 #endif
-- 
cgit v1.2.3