diff -uprN src0/gdb/gdbtypes.c src1/gdb/gdbtypes.c
--- src0/gdb/gdbtypes.c	2009-07-06 09:28:18.000000000 -0400
+++ src1/gdb/gdbtypes.c	2009-08-06 09:19:53.000000000 -0400
@@ -539,7 +539,6 @@ make_qualified_type (struct type *type, 
 struct type *
 make_type_with_address_space (struct type *type, int space_flag)
 {
-  struct type *ntype;
   int new_flags = ((TYPE_INSTANCE_FLAGS (type)
 		    & ~(TYPE_INSTANCE_FLAG_CODE_SPACE
 			| TYPE_INSTANCE_FLAG_DATA_SPACE
@@ -566,9 +565,6 @@ make_cv_type (int cnst, int voltl, 
 	      struct type **typeptr)
 {
   struct type *ntype;	/* New type */
-  struct type *tmp_type = type;	/* tmp type */
-  struct objfile *objfile;
-
   int new_flags = (TYPE_INSTANCE_FLAGS (type)
 		   & ~(TYPE_INSTANCE_FLAG_CONST | TYPE_INSTANCE_FLAG_VOLATILE));