From c750388a853ceb9e4ca75c7381c1e3d109fcaeec Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 22 Jul 2005 03:26:05 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog  | 8 ++++++++
 libiberty/memcpy.c   | 4 ----
 libiberty/memmove.c  | 4 ----
 libiberty/objalloc.c | 2 --
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c30f54e..8bd0ce0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,13 @@
 2005-07-22  Ben Elliston  <bje@gnu.org>
 
+	Recover patch lost in the sourceware repository:
+	2005-07-09  Ben Elliston  <bje@au.ibm.com>
+	* memcpy.c: Remove ANSI_PROTOTYPES conditional code.
+	* memmove.c: Likewise.
+	* objalloc.c: Likewise.
+
+2005-07-22  Ben Elliston  <bje@gnu.org>
+
 	* configure.ac: Check for a getopt(3) declaration.
 	* configure, config.in: Regenerate.
 
diff --git a/libiberty/memcpy.c b/libiberty/memcpy.c
index 8a97b85..9b5b242 100644
--- a/libiberty/memcpy.c
+++ b/libiberty/memcpy.c
@@ -13,11 +13,7 @@ Copies @var{length} bytes from memory region @var{in} to region
 */
 
 #include <ansidecl.h>
-#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
-#else
-#define size_t unsigned long
-#endif
 
 void bcopy (const void*, void*, size_t);
 
diff --git a/libiberty/memmove.c b/libiberty/memmove.c
index 30801f2..06a24fc 100644
--- a/libiberty/memmove.c
+++ b/libiberty/memmove.c
@@ -13,11 +13,7 @@ Copies @var{count} bytes from memory area @var{from} to memory area
 */
 
 #include <ansidecl.h>
-#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
-#else
-#define size_t unsigned long
-#endif
 
 void bcopy (const void*, void*, size_t);
 
diff --git a/libiberty/objalloc.c b/libiberty/objalloc.c
index d3d2d16..3ddac2c 100644
--- a/libiberty/objalloc.c
+++ b/libiberty/objalloc.c
@@ -30,10 +30,8 @@ Boston, MA 02110-1301, USA.  */
 #include <unixlib.h>
 #else
 
-#ifdef ANSI_PROTOTYPES
 /* Get a definition for size_t.  */
 #include <stddef.h>
-#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-- 
2.7.4