merge from gcc

3 files changed, 11 insertions, 11 deletions

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 62d3929d22..9e218b59fb 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-11  Thomas Neumann  tneumann@users.sourceforge.net
+
+	* argv.c: Use ANSI C declarations.
+	* make-relative-prefix.c: Likewise.
+
 2007-04-06  Joel Brobecker  <brobecker@adacore.com>
 
 	* filename_cmp.c (filename_cmp): Improve documentation.
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 11ca549a8e..e76c1f825d 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -312,9 +312,7 @@ operating system to free the memory when the program exits.
 */
 
 void
-expandargv (argcp, argvp)
-     int *argcp;
-     char ***argvp;
+expandargv (int *argcp, char ***argvp)
 {
   /* The argument we are currently processing.  */
   int i = 0;
diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
index 4116ec9963..037809e34e 100644
--- a/libiberty/make-relative-prefix.c
+++ b/libiberty/make-relative-prefix.c
@@ -400,10 +400,8 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
    from somwhere else. */
 
 char *
-make_relative_prefix (progname, bin_prefix, prefix)
-     const char *progname;
-     const char *bin_prefix;
-     const char *prefix;
+make_relative_prefix (const char *progname, const char *bin_prefix,
+		      const char *prefix)
 {
   return make_relative_prefix_1 (progname, bin_prefix, prefix, 1);
 }
@@ -414,10 +412,9 @@ make_relative_prefix (progname, bin_prefix, prefix)
    installation is patched together with soft links. */
 
 char *
-make_relative_prefix_ignore_links (progname, bin_prefix, prefix)
-     const char *progname;
-     const char *bin_prefix;
-     const char *prefix;
+make_relative_prefix_ignore_links (const char *progname,
+				   const char *bin_prefix,
+				   const char *prefix)
 {
   return make_relative_prefix_1 (progname, bin_prefix, prefix, 0);
 }