From 6c65ad612f670a9637fb239c99aa40138f4503d0 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@delorie.com>
Date: Sat, 9 Jul 2005 13:05:49 +0000
Subject: merge from gcc

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

(limited to 'libiberty')

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5bbaa1c3588..dc55ff2e546 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,9 +1,3 @@
-2005-07-09  Ben Elliston  <bje@au.ibm.com>
-
-	* memcpy.c: Remove ANSI_PROTOTYPES conditional code.
-	* memmove.c: Likewise.
-	* objalloc.c: Likewise.
-
 2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* config.table: Delete file.  Move former contents into ...
diff --git a/libiberty/memcpy.c b/libiberty/memcpy.c
index 9b5b24295df..8a97b85b06a 100644
--- a/libiberty/memcpy.c
+++ b/libiberty/memcpy.c
@@ -13,7 +13,11 @@ 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 06a24fc2688..30801f2d1c4 100644
--- a/libiberty/memmove.c
+++ b/libiberty/memmove.c
@@ -13,7 +13,11 @@ 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 3ddac2ce4cb..d3d2d16e4a5 100644
--- a/libiberty/objalloc.c
+++ b/libiberty/objalloc.c
@@ -30,8 +30,10 @@ 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>
-- 
cgit v1.2.1