summaryrefslogtreecommitdiffstats
path: root/libc/string/memset.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-25 04:03:33 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-25 04:03:33 +0000
commitcb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 (patch)
tree520f8e8d113184cfa7954ebd274564b8c255fa9a /libc/string/memset.c
parente4461be66e2655058aef358b00050bc70ac72861 (diff)
downloaduClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.bz2
uClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.xz
Merge from trunk. Going pretty good so far. Kind of. Okay, not really.
Diffstat (limited to 'libc/string/memset.c')
-rw-r--r--libc/string/memset.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/string/memset.c b/libc/string/memset.c
index cb97dbce8..2f3fc271d 100644
--- a/libc/string/memset.c
+++ b/libc/string/memset.c
@@ -8,14 +8,13 @@
#include "_string.h"
#ifdef WANT_WIDE
-# define __Wmemset __wmemset
# define Wmemset wmemset
#else
-# define __Wmemset __memset
+libc_hidden_proto(memset)
# define Wmemset memset
#endif
-Wvoid attribute_hidden *__Wmemset(Wvoid *s, Wint c, size_t n)
+Wvoid *Wmemset(Wvoid *s, Wint c, size_t n)
{
register Wuchar *p = (Wuchar *) s;
#ifdef __BCC__
@@ -34,4 +33,6 @@ Wvoid attribute_hidden *__Wmemset(Wvoid *s, Wint c, size_t n)
}
#undef np
-strong_alias(__Wmemset,Wmemset)
+#ifndef WANT_WIDE
+libc_hidden_def(memset)
+#endif