From db42c6e8ee92965ca26f4ccf2183d26a8c560931 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Thu, 12 Jul 2007 03:10:12 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog | 4 ++++
 libiberty/argv.c    | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ad6cd02ef20..fffd19a28c4 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -4,6 +4,10 @@
 	* Makefile.in: Rebuild deps.
 	(maintainer-clean-subdir): Depend on stamp-h rather than config.h.
 
+2007-07-02  Simon Baldwin <simonb@google.com>
+
+	* argv.c (writeargv): Removed declaration of unused variable.
+
 2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
 
 	* configure.ac: Use ACX_PROG_CC_ALMOST_PEDANTIC too.
diff --git a/libiberty/argv.c b/libiberty/argv.c
index a04f50d7f49..faeb72de448 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -310,7 +310,6 @@ writeargv (char **argv, FILE *f)
 
   while (*argv != NULL)
     {
-      int ret;
       const char *arg = *argv;
 
       while (*arg != EOS)
-- 
2.30.2