diff -uprN src0/gdb/macrocmd.c src1/gdb/macrocmd.c
--- src0/gdb/macrocmd.c	2009-05-26 09:56:19.000000000 -0400
+++ src1/gdb/macrocmd.c	2009-08-06 09:15:41.000000000 -0400
@@ -387,8 +387,6 @@ extern initialize_file_ftype _initialize
 void
 _initialize_macrocmd (void)
 {
-  struct cmd_list_element *c;
-
   /* We introduce a new command prefix, `macro', under which we'll put
      the various commands for working with preprocessor macros.  */
   add_prefix_cmd ("macro", class_info, macro_command,
diff -uprN src0/gdb/macroexp.c src1/gdb/macroexp.c
--- src0/gdb/macroexp.c	2009-05-26 09:56:19.000000000 -0400
+++ src1/gdb/macroexp.c	2009-08-06 09:16:06.000000000 -0400
@@ -805,8 +805,6 @@ gather_arguments (const char *name, stru
       depth = 0;
       for (;;)
         {
-          char *start = src->text;
-
           if (! get_token (&tok, src))
             error (_("Malformed argument list for macro `%s'."), name);
       
@@ -1004,7 +1002,7 @@ substitute_args (struct macro_buffer *de
 	       && lookahead.text[0] == '#'
 	       && lookahead.text[1] == '#')
 	{
-	  int arg, finished = 0;
+	  int finished = 0;
 	  int prev_was_comma = 0;
 
 	  /* Note that GCC warns if the result of splicing is not a