merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c30f54e0e6ceb35812cddb33efc7c1da372c8e28..8bd0ce01c6e0c1abe2b5d1e0dbca273d353f9103 100644 (file)
--- 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 8a97b85b06a517c3338338d602a132c6e6930dfb..9b5b24295df6c5e1a7e85264b7287f97e52a1a32 100644 (file)
--- 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 30801f2d1c44db8c54bc45d6d2fdf37fad2b63e6..06a24fc268851ebada95c4af53b0d1b89f84ee7a 100644 (file)
--- 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 d3d2d16e4a5cce25928a38aaedd261cc841746e9..3ddac2ce4cbfbda496aa320d4578203391d7956f 100644 (file)
--- 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>