merge from gcc

diff --git a/libiberty/argv.c b/libiberty/argv.c
index 4205579a576530089f432ca737e4fb10b43e85cb..e4a03793b65d8ad49c381c40235a1a617b71ec04 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 
 /*  Routines imported from standard C runtime libraries. */
 
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 
 #include <stddef.h>
 #include <string.h>

diff --git a/libiberty/copysign.c b/libiberty/copysign.c
index 5c48a5422eba5a820ea4c3c09a7a0f8f8d43c03c..d288be239eb45b2cf4def41075a4329d9e036fcc 100644 (file)
--- a/libiberty/copysign.c
+++ b/libiberty/copysign.c
@@ -131,7 +131,9 @@ typedef union
 
 #if defined(__IEEE_BIG_ENDIAN) || defined(__IEEE_LITTLE_ENDIAN)
 
-double DEFUN(copysign, (x, y), double x AND double y)
+double
+copysign (x, y)
+     double x, y;
 {
   __ieee_double_shape_type a,b;
   b.value = y;  
@@ -142,7 +144,9 @@ double DEFUN(copysign, (x, y), double x AND double y)
 
 #else
 
-double DEFUN(copysign, (x, y), double x AND double y)
+double
+copysign (x, y)
+     double x, y;
 {
   if ((x < 0 && y > 0) || (x > 0 && y < 0))
     return -x;

diff --git a/libiberty/memchr.c b/libiberty/memchr.c
index f94bea018f53e351bebcccb8f8e80331426d6672..3948125963d2a1ff538aba2d7bbc01b09524a6a5 100644 (file)
--- a/libiberty/memchr.c
+++ b/libiberty/memchr.c
@@ -15,7 +15,7 @@ returned.
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long

diff --git a/libiberty/memcmp.c b/libiberty/memcmp.c
index d8d3997d0661c9ff52f37e53f12c907505f30072..92f2b6e6425726f7e1fd12f26120a4200e62c10b 100644 (file)
--- a/libiberty/memcmp.c
+++ b/libiberty/memcmp.c
@@ -16,15 +16,17 @@ as if comparing unsigned char arrays.
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long
 #endif
 
 int
-DEFUN(memcmp, (str1, str2, count),
-      const PTR str1 AND const PTR str2 AND size_t count)
+memcmp (str1, str2, count)
+     const PTR str1;
+     const PTR str2;
+     size_t count;
 {
   register const unsigned char *s1 = (const unsigned char*)str1;
   register const unsigned char *s2 = (const unsigned char*)str2;

diff --git a/libiberty/memcpy.c b/libiberty/memcpy.c
index 0f2bac7ac2c8a28fe9035587e9a18b9967dee3cb..5eece7a0a0015c2535d50c58e03a33e16129519c 100644 (file)
--- a/libiberty/memcpy.c
+++ b/libiberty/memcpy.c
@@ -13,14 +13,19 @@ Copies @var{length} bytes from memory region @var{in} to region
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long
 #endif
 
+void bcopy PARAMS((const void*, void*, size_t));
+
 PTR
-DEFUN(memcpy, (out, in, length), PTR out AND const PTR in AND size_t length)
+memcpy (out, in, length)
+     PTR out;
+     const PTR in;
+     size_t length;
 {
     bcopy(in, out, length);
     return out;

diff --git a/libiberty/memmove.c b/libiberty/memmove.c
index 3ec73208ca7314287455b2ac94461fa2cd252da9..00ac053401bf34833e5447c374153b7fefd68611 100644 (file)
--- a/libiberty/memmove.c
+++ b/libiberty/memmove.c
@@ -13,12 +13,14 @@ 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 PARAMS ((const void*, void*, size_t));
+
 PTR
 memmove (s1, s2, n)
      PTR s1;

diff --git a/libiberty/memset.c b/libiberty/memset.c
index 489ca1748157c034d17c376d7cf725c8c4ed784b..5119f858ad067c1b834a2f00772fa3894602c69f 100644 (file)
--- a/libiberty/memset.c
+++ b/libiberty/memset.c
@@ -13,15 +13,17 @@ Sets the first @var{count} bytes of @var{s} to the constant byte
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long
 #endif
 
 PTR
-DEFUN(memset, (dest, val, len),
-      PTR dest AND register int val AND register size_t len)
+memset (dest, val, len)
+     PTR dest;
+     register int val;
+     register size_t len;
 {
   register unsigned char *ptr = (unsigned char*)dest;
   while (len-- > 0)

diff --git a/libiberty/sigsetmask.c b/libiberty/sigsetmask.c
index f705fbb2df2b02c7964ea1f8f39fff56d1e3a377..4de3e4b1eb826d9bd678bd84ff932862900dac04 100644 (file)
--- a/libiberty/sigsetmask.c
+++ b/libiberty/sigsetmask.c
@@ -25,8 +25,8 @@ extern void abort PARAMS ((void)) ATTRIBUTE_NORETURN;
 
 #ifdef SIG_SETMASK
 int
-DEFUN(sigsetmask,(set),
-      int set)
+sigsetmask (set)
+      int set;
 {
     sigset_t new;
     sigset_t old;

diff --git a/libiberty/strcasecmp.c b/libiberty/strcasecmp.c
index 4bfe65077121e45612e38bd42b8e90ffcb93315c..d2608dc0b8786a3ecb8ab66e19197f3e0d24c35d 100644 (file)
--- a/libiberty/strcasecmp.c
+++ b/libiberty/strcasecmp.c
@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)strcasecmp.c      5.5 (Berkeley) 11/24/87";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long

diff --git a/libiberty/strncasecmp.c b/libiberty/strncasecmp.c
index 77cb421770194f1ac948f15706c1709c82363198..10feee82198e2105f2591164d413078c1ee7c3e3 100644 (file)
--- a/libiberty/strncasecmp.c
+++ b/libiberty/strncasecmp.c
@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)strcasecmp.c      5.5 (Berkeley) 11/24/87";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long

diff --git a/libiberty/strncmp.c b/libiberty/strncmp.c
index 819cea6cb58be2a9fd5f0f96ae4245514e091837..ad87e1fde8ba704aa7ca64f9ca3b9cb8e157a268 100644 (file)
--- a/libiberty/strncmp.c
+++ b/libiberty/strncmp.c
@@ -13,7 +13,7 @@ Compares the first @var{n} bytes of two strings, returning a value as
 */
 
 #include <ansidecl.h>
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long

diff --git a/libiberty/xatexit.c b/libiberty/xatexit.c
index abf340737e41e9b3fdd77516c1f25d56cc9e55d3..075599c61f95fd1580e1d69b0b3c85f4fe29a543 100644 (file)
--- a/libiberty/xatexit.c
+++ b/libiberty/xatexit.c
@@ -27,7 +27,7 @@ failure.  If you use @code{xatexit} to register functions, you must use
 
 #include <stdio.h>
 
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long

diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index 4c8249ae70bfaaafcd56f64129e0c7ea5c1ecf9e..c3fe1a84f4d2c21ae9c90c6b3800e1131e1ab81a 100644 (file)
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -68,7 +68,7 @@ function will be called to print an error message and terminate execution.
 
 #include <stdio.h>
 
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
 #define size_t unsigned long