diff -uprN src0/gdb/m2-typeprint.c src1/gdb/m2-typeprint.c
--- src0/gdb/m2-typeprint.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/m2-typeprint.c	2009-08-06 10:24:18.000000000 -0400
@@ -71,7 +71,6 @@ m2_print_type (struct type *type, char *
 	       int show, int level)
 {
   enum type_code code;
-  int demangled_args;
 
   CHECK_TYPEDEF (type);
 
@@ -427,8 +426,6 @@ m2_is_long_set_of_type (struct type *typ
 static int
 m2_long_set (struct type *type, struct ui_file *stream, int show, int level)
 {
-  struct type *index_type;
-  struct type *range_type;
   struct type *of_type;
   int i;
   int len = TYPE_NFIELDS (type);
diff -uprN src0/gdb/m2-valprint.c src1/gdb/m2-valprint.c
--- src0/gdb/m2-valprint.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/m2-valprint.c	2009-08-06 10:25:56.000000000 -0400
@@ -322,8 +322,6 @@ m2_val_print (struct type *type, const g
   unsigned len;
   struct type *elttype;
   unsigned eltlen;
-  int length_pos, length_size, string_pos;
-  int char_size;
   LONGEST val;
   CORE_ADDR addr;