From: DJ Delorie <dj@redhat.com>
Date: Fri, 22 Jul 2005 03:26:05 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c750388a853ceb9e4ca75c7381c1e3d109fcaeec;p=binutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c30f54e0e6c..8bd0ce01c6e 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+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.
diff --git a/libiberty/memcpy.c b/libiberty/memcpy.c
index 8a97b85b06a..9b5b24295df 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 30801f2d1c4..06a24fc2688 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 d3d2d16e4a5..3ddac2ce4cb 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>