diff -uprN src0/gdb/c-lang.c src1/gdb/c-lang.c
--- src0/gdb/c-lang.c	2009-07-09 17:20:15.000000000 -0400
+++ src1/gdb/c-lang.c	2009-08-06 10:16:12.000000000 -0400
@@ -76,7 +76,6 @@ static enum c_string_type
 classify_type (struct type *elttype, enum bfd_endian byte_order,
 	       const char **encoding)
 {
-  struct type *saved_type;
   enum c_string_type result;
 
   /* We loop because ELTTYPE may be a typedef, and we want to
@@ -325,7 +324,7 @@ c_emit_char (int c, struct type *type, s
   make_cleanup_obstack_free (&output);
 
   convert_between_encodings (INTERMEDIATE_ENCODING, host_charset (),
-			     obstack_base (&wchar_buf),
+			     (gdb_byte *)obstack_base (&wchar_buf),
 			     obstack_object_size (&wchar_buf),
 			     1, &output, translit_char);
   obstack_1grow (&output, '\0');
@@ -354,6 +353,11 @@ c_printchar (int c, struct type *type, s
     case C_CHAR_32:
       fputc_filtered ('U', stream);
       break;
+    case C_STRING:
+    case C_WIDE_STRING:
+    case C_STRING_16:
+    case C_STRING_32:
+      break;
     }
 
   fputc_filtered ('\'', stream);
@@ -409,6 +413,11 @@ c_printstr (struct ui_file *stream, stru
     case C_STRING_32:
       fputs_filtered ("U", stream);
       break;
+    case C_CHAR:
+    case C_WIDE_CHAR:
+    case C_CHAR_16:
+    case C_CHAR_32:
+      break;
     }
 
   if (length == 0)
@@ -573,6 +582,10 @@ c_printstr (struct ui_file *stream, stru
 	  obstack_grow_wstr (&wchar_buf, LCST (">"));
 	  finished = 1;
 	  break;
+
+	case wchar_iterate_ok:
+	case wchar_iterate_eof:
+	  break;
 	}
     }
 
@@ -593,7 +606,7 @@ c_printstr (struct ui_file *stream, stru
   make_cleanup_obstack_free (&output);
 
   convert_between_encodings (INTERMEDIATE_ENCODING, host_charset (),
-			     obstack_base (&wchar_buf),
+			     (gdb_byte *)obstack_base (&wchar_buf),
 			     obstack_object_size (&wchar_buf),
 			     1, &output, translit_char);
   obstack_1grow (&output, '\0');
@@ -911,7 +924,8 @@ parse_one_string (struct obstack *output
       /* If we saw a run of characters, convert them all.  */
       if (p > data)
 	convert_between_encodings (host_charset (), dest_charset,
-				   data, p - data, 1, output, translit_none);
+				   (gdb_byte *)data, p - data, 1, output,
+				   translit_none);
       /* If we saw an escape, convert it.  */
       if (p < limit)
 	p = convert_escape (type, dest_charset, p, limit, output);
@@ -1014,7 +1028,7 @@ evaluate_subexp_c (struct type *expect_t
 
 	    if (obstack_object_size (&output) != TYPE_LENGTH (type))
 	      error (_("Could not convert character constant to target character set"));
-	    value = unpack_long (type, obstack_base (&output));
+	    value = unpack_long (type, (gdb_byte *)obstack_base (&output));
 	    result = value_from_longest (type, value);
 	  }
 	else
diff -uprN src0/gdb/f-lang.c src1/gdb/f-lang.c
--- src0/gdb/f-lang.c	2009-07-06 09:28:18.000000000 -0400
+++ src1/gdb/f-lang.c	2009-08-06 10:16:26.000000000 -0400
@@ -150,7 +150,6 @@ f_printstr (struct ui_file *stream, stru
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
-  int width = TYPE_LENGTH (type);
 
   if (length == 0)
     {
diff -uprN src0/gdb/jv-lang.c src1/gdb/jv-lang.c
--- src0/gdb/jv-lang.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/jv-lang.c	2009-08-06 10:21:48.000000000 -0400
@@ -246,8 +246,6 @@ type_from_class (struct gdbarch *gdbarch
   struct value *utf8_name;
   char *nptr;
   CORE_ADDR addr;
-  struct block *bl;
-  struct dict_iterator iter;
   int is_array = 0;
 
   type = check_typedef (value_type (clas));
@@ -1012,7 +1010,6 @@ java_class_name_from_physname (const cha
 {
   char *ret = NULL;
   const char *end;
-  int depth = 0;
   char *demangled_name = java_demangle (physname, DMGL_PARAMS | DMGL_ANSI);
 
   if (demangled_name == NULL)
diff -uprN src0/gdb/language.c src1/gdb/language.c
--- src0/gdb/language.c	2009-05-26 09:56:19.000000000 -0400
+++ src1/gdb/language.c	2009-08-06 09:24:38.000000000 -0400
@@ -1340,8 +1340,6 @@ language_lookup_primitive_type_by_name (
 void
 _initialize_language (void)
 {
-  struct cmd_list_element *set, *show;
-
   language_gdbarch_data
     = gdbarch_data_register_post_init (language_gdbarch_post_init);
 
diff -uprN src0/gdb/m2-lang.c src1/gdb/m2-lang.c
--- src0/gdb/m2-lang.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/m2-lang.c	2009-08-06 10:22:04.000000000 -0400
@@ -111,7 +111,6 @@ m2_printstr (struct ui_file *stream, str
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
-  int width = TYPE_LENGTH (type);
 
   if (length == 0)
     {
diff -uprN src0/gdb/objc-lang.c src1/gdb/objc-lang.c
--- src0/gdb/objc-lang.c	2009-07-06 09:28:20.000000000 -0400
+++ src1/gdb/objc-lang.c	2009-08-06 10:16:40.000000000 -0400
@@ -350,7 +350,6 @@ objc_printstr (struct ui_file *stream, s
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
-  int width = TYPE_LENGTH (type);
 
   /* If the string was not truncated due to `set print elements', and
      the last byte of it is a null, we don't print that, in
diff -uprN src0/gdb/scm-lang.c src1/gdb/scm-lang.c
--- src0/gdb/scm-lang.c	2009-07-06 09:28:20.000000000 -0400
+++ src1/gdb/scm-lang.c	2009-08-06 10:22:55.000000000 -0400
@@ -35,8 +35,6 @@
 #include "objfiles.h"
 
 extern void _initialize_scheme_language (void);
-static struct value *evaluate_subexp_scm (struct type *, struct expression *,
-				      int *, enum noside);
 static struct value *scm_lookup_name (struct gdbarch *, char *);
 static int in_eval_c (void);