diff -uprN src0/gdb/source.c src1/gdb/source.c
--- src0/gdb/source.c	2009-07-31 14:43:26.000000000 -0400
+++ src1/gdb/source.c	2009-08-06 09:01:42.000000000 -0400
@@ -171,8 +171,6 @@ get_current_source_symtab_and_line (void
 void
 set_default_source_symtab_and_line (void)
 {
-  struct symtab_and_line cursal;
-
   if (!have_full_symbols () && !have_partial_symbols ())
     error (_("No symbol table is loaded.  Use the \"file\" command."));
 
@@ -1890,7 +1888,6 @@ unset_substitute_path_command (char *arg
 static void
 set_substitute_path_command (char *args, int from_tty)
 {
-  char *from_path, *to_path;
   char **argv;
   struct substitute_path_rule *rule;