summaryrefslogtreecommitdiffstats
path: root/libc/string/generic/strstr.c
diff options
context:
space:
mode:
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
commite523bd15353350c3480b8a1820a0944b0fa8212e (patch)
tree60485116f9c62c306bb753f12f9d4eb79d16aa4e /libc/string/generic/strstr.c
parent3b3434516a3415d7e0f4e1d50c553876dcb337b2 (diff)
downloaduClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.bz2
uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.xz
Big fricking merge from trunk.
Diffstat (limited to 'libc/string/generic/strstr.c')
-rw-r--r--libc/string/generic/strstr.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libc/string/generic/strstr.c b/libc/string/generic/strstr.c
index b16261e56..12e384014 100644
--- a/libc/string/generic/strstr.c
+++ b/libc/string/generic/strstr.c
@@ -30,8 +30,6 @@
typedef unsigned chartype;
-#undef strstr
-
char attribute_hidden *__strstr (const char *phaystack, const char *pneedle)
{
const unsigned char *haystack, *needle;
@@ -112,4 +110,4 @@ ret0:
return 0;
}
-strong_alias(__strstr, strstr)
+strong_alias(__strstr,strstr)