From 48f3e29b3804ae097bd90258457de373ed02dd80 Mon Sep 17 00:00:00 2001
From: Philippe De Muyter <phdm@macqel.be>
Date: Thu, 8 Jun 2000 09:29:53 +0200
Subject: [PATCH] cp-demangle.c (stdio.h): File included unconditionaly.

	* cp-demangle.c (stdio.h): File included unconditionaly.
	(template_arg_list_new): Parameter list is PARAMS ((void)), not ().
	* dyn-string.c (stdio.h): File included.
	* partition.c (partition_print): No `&' needed to take the address of
	a function.

From-SVN: r34450
---
 libiberty/ChangeLog     | 8 ++++++++
 libiberty/cp-demangle.c | 4 +---
 libiberty/dyn-string.c  | 2 ++
 libiberty/partition.c   | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index a9a15f116f3..a8683969395 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun  8 09:25:54 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* cp-demangle.c (stdio.h): File included unconditionaly.
+	(template_arg_list_new): Parameter list is PARAMS ((void)), not ().
+	* dyn-string.c (stdio.h): File included.
+	* partition.c (partition_print): No `&' needed to take the address of
+	a function.
+
 2000-06-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in (ac_libiberty_warn_cflags): Add -pedantic.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 2feac6c30ef..58aed0d5f4f 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -33,9 +33,7 @@
 #include <stdlib.h>
 #endif
 
-#if defined(CP_DEMANGLE_DEBUG) || defined(STANDALONE_DEMANGLER)
 #include <stdio.h>
-#endif
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -514,7 +512,7 @@ substitutions_print (dm, fp)
 /* Creates a new template argument list.  */
 
 static template_arg_list_t
-template_arg_list_new ()
+template_arg_list_new PARAMS((void))
 {
   template_arg_list_t new_list 
     = (template_arg_list_t) xmalloc (sizeof (struct template_arg_list_def));
diff --git a/libiberty/dyn-string.c b/libiberty/dyn-string.c
index 2ae64ebb6c2..f4a9d9a74f8 100644
--- a/libiberty/dyn-string.c
+++ b/libiberty/dyn-string.c
@@ -23,6 +23,8 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #endif
 
+#include <stdio.h>
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/libiberty/partition.c b/libiberty/partition.c
index 6975af49594..a5a734937ae 100644
--- a/libiberty/partition.c
+++ b/libiberty/partition.c
@@ -177,7 +177,7 @@ partition_print (part, fp)
 	  c = elements[c].next - elements;
 	}
 	/* Sort them.  */
-	qsort ((void *) class_elements, count, sizeof (int), &elem_compare);
+	qsort ((void *) class_elements, count, sizeof (int), elem_compare);
 	/* Print them.  */
 	fputc ('(', fp);
 	for (i = 0; i < count; ++i)