diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
commit | e523bd15353350c3480b8a1820a0944b0fa8212e (patch) | |
tree | 60485116f9c62c306bb753f12f9d4eb79d16aa4e /libc/string/generic/strcmp.c | |
parent | 3b3434516a3415d7e0f4e1d50c553876dcb337b2 (diff) | |
download | uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.bz2 uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.xz |
Big fricking merge from trunk.
Diffstat (limited to 'libc/string/generic/strcmp.c')
-rw-r--r-- | libc/string/generic/strcmp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c index f12424243..209aeed15 100644 --- a/libc/string/generic/strcmp.c +++ b/libc/string/generic/strcmp.c @@ -17,12 +17,9 @@ 02111-1307 USA. */ #include <string.h> -#include <locale.h> #include "memcopy.h" -#undef strcmp - /* Compare S1 and S2, returning less than, equal to or greater than zero if S1 is lexicographically less than, equal to or greater than S2. */ @@ -44,9 +41,9 @@ int attribute_hidden __strcmp (const char *p1, const char *p2) return c1 - c2; } -strong_alias(__strcmp, strcmp) +strong_alias(__strcmp,strcmp) -#ifdef __LOCALE_C_ONLY -hidden_strong_alias(__strcmp, __strcoll) -strong_alias(__strcmp, strcoll) -#endif /* __LOCALE_C_ONLY */ +#ifndef __UCLIBC_HAS_LOCALE__ +hidden_strong_alias(__strcmp,__strcoll) +strong_alias(__strcmp,strcoll) +#endif |