diff -uprN src0/gdb/utils.c src1/gdb/utils.c --- src0/gdb/utils.c 2009-07-31 14:43:27.000000000 -0400 +++ src1/gdb/utils.c 2009-08-06 10:27:58.000000000 -0400 @@ -261,7 +261,6 @@ make_cleanup_close (int fd) static void do_fclose_cleanup (void *arg) { - FILE *file = arg; fclose (arg); } @@ -548,7 +547,6 @@ add_inferior_continuation (void (*contin void do_all_inferior_continuations (void) { - struct cleanup *old_chain; struct cleanup *as_cleanup; struct inferior *inf = current_inferior (); @@ -857,7 +855,6 @@ static const char *internal_problem_mode internal_problem_no, NULL }; -static const char *internal_problem_mode = internal_problem_ask; /* Print a message reporting an internal error/warning. Ask the user if they want to continue, dump core, or just exit. Return @@ -1612,7 +1609,8 @@ host_char_to_target (int c, int *target_ cleanups = make_cleanup_obstack_free (&host_data); convert_between_encodings (target_charset (), host_charset (), - &the_char, 1, 1, &host_data, translit_none); + (gdb_byte *)&the_char, 1, 1, &host_data, + translit_none); if (obstack_object_size (&host_data) == 1) { @@ -2765,8 +2763,6 @@ show_debug_timestamp (struct ui_file *fi void initialize_utils (void) { - struct cmd_list_element *c; - add_setshow_uinteger_cmd ("width", class_support, &chars_per_line, _("\ Set number of characters gdb thinks are in a line."), _("\ Show number of characters gdb thinks are in a line."), NULL,