From a5173428bbf42060944d0a09d65fb8518ab2fa3a Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 19 Mar 2011 01:11:10 +0100 Subject: fnmatch: replace __memset and __memcmp Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/misc/fnmatch/fnmatch.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libc/misc/fnmatch/fnmatch.c') diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index 2874413ec..413162f86 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -54,10 +54,6 @@ # include #endif -#ifdef __UCLIBC__ -# define __memset memset -#endif - /* For platform which support the ISO C amendement 1 functionality we support user defined character classes. */ #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H) @@ -347,7 +343,7 @@ fnmatch (const char *pattern, const char *string, int flags) wchar_t *wstring = NULL; /* Convert the strings into wide characters. */ - __memset (&ps, '\0', sizeof (ps)); + memset (&ps, '\0', sizeof (ps)); p = pattern; #ifdef _LIBC n = strnlen (pattern, 1024); @@ -364,7 +360,7 @@ fnmatch (const char *pattern, const char *string, int flags) already done? */ return -1; if (p) - __memset (&ps, '\0', sizeof (ps)); + memset (&ps, '\0', sizeof (ps)); } if (__builtin_expect (p != NULL, 0)) { @@ -396,7 +392,7 @@ fnmatch (const char *pattern, const char *string, int flags) already done? */ return -1; if (p) - __memset (&ps, '\0', sizeof (ps)); + memset (&ps, '\0', sizeof (ps)); } if (__builtin_expect (p != NULL, 0)) { -- cgit v1.2.3