merge from gcc

[deliverable/binutils-gdb.git] / libiberty / memmove.c

diff --git a/libiberty/memmove.c b/libiberty/memmove.c
index 3ec73208ca7314287455b2ac94461fa2cd252da9..30801f2d1c44db8c54bc45d6d2fdf37fad2b63e6 100644 (file)
--- a/libiberty/memmove.c
+++ b/libiberty/memmove.c
@@ -13,17 +13,16 @@ Copies @var{count} bytes from memory area @var{from} to memory area
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long
 #endif
 
+void bcopy (const void*, void*, size_t);
+
 PTR
-memmove (s1, s2, n)
-     PTR s1;
-     const PTR s2;
-     size_t n;
+memmove (PTR s1, const PTR s2, size_t n)
 {
   bcopy (s2, s1, n);
   return s1;