merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 34f421e..c9b048e 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-31  Andreas Jaeger  <aj@suse.de>
+
+       * floatformat.c (floatformat_always_valid): Add unused attribute.
+
 2003-10-30  Josef Zlomek  <zlomekj@suse.cz>
 
        * hashtab.c (htab_find_slot_with_hash): Decrease n_deleted

diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index 3589caa..daac661 100644 (file)
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -39,8 +39,8 @@ static int floatformat_always_valid PARAMS ((const struct floatformat *fmt,
 
 static int
 floatformat_always_valid (fmt, from)
-     const struct floatformat *fmt;
-     const char *from;
+     const struct floatformat *fmt ATTRIBUTE_UNUSED;
+     const char *from ATTRIBUTE_UNUSED;
 {
   return 1;
 }