2002-07-30 Roland McGrath <roland@redhat.com>

	* malloc/malloc.c [_LIBC]: Include <string.h> instead of using local
	decls of memset and memcpy.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index cd40626..0440be5 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -516,6 +516,9 @@ Void_t *(*__morecore)(ptrdiff_t) = __default_morecore;
 
 #if (__STD_C || defined(HAVE_MEMCPY))
 
+#ifdef _LIBC
+# include <string.h>
+#else
 #ifdef WIN32
 /* On Win32 memset and memcpy are already declared in windows.h */
 #else
@@ -528,6 +531,7 @@ Void_t* memcpy();
 #endif
 #endif
 #endif
+#endif
 
 /*
   MALLOC_FAILURE_ACTION is the action to take before "return 0" when