summaryrefslogtreecommitdiffstats
path: root/pbl/string.c
diff options
context:
space:
mode:
Diffstat (limited to 'pbl/string.c')
-rw-r--r--pbl/string.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/pbl/string.c b/pbl/string.c
index 6787e82c9b..b773f5cf7c 100644
--- a/pbl/string.c
+++ b/pbl/string.c
@@ -5,6 +5,7 @@
*/
#include <linux/types.h>
+#include <linux/string.h>
void *memcpy(void *__dest, __const void *__src, size_t __n)
{
@@ -103,7 +104,7 @@ void *memchr(const void *s, int c, size_t count)
return NULL;
}
-char *strchr(const char *s, int c)
+char *_strchr(const char *s, int c)
{
while (*s != (char)c)
if (*s++ == '\0')
@@ -111,8 +112,6 @@ char *strchr(const char *s, int c)
return (char *)s;
}
-#undef memset
-
void *memset(void *s, int c, size_t count)
{
char *xs = s;
@@ -120,8 +119,3 @@ void *memset(void *s, int c, size_t count)
*xs++ = c;
return s;
}
-
-void __memzero(void *s, size_t count)
-{
- memset(s, 0, count);
-}