Index: contrib/gdb/gdb/breakpoint.c
===================================================================
--- contrib/gdb/gdb/breakpoint.c
+++ contrib/gdb/gdb/breakpoint.c
@@ -7619,7 +7619,7 @@
 	      int mem_cnt = can_use_hardware_watchpoint (bpt->val);
 	      
 	      /* Hack around 'unused var' error for some targets here */
-	      (void) mem_cnt;
+	      (void) mem_cnt, i;
 	      target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
 									bpt->type, i + mem_cnt, other_type_used);
 	      /* we can consider of type is bp_hardware_watchpoint, convert to 
Index: contrib/gdb/gdb/c-typeprint.c
===================================================================
--- contrib/gdb/gdb/c-typeprint.c
+++ contrib/gdb/gdb/c-typeprint.c
@@ -540,7 +540,7 @@
 	fprintf_filtered (stream, ")");
 
       fprintf_filtered (stream, "[");
-      if ((int)(TYPE_LENGTH (type)) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
+      if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
 	&& TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
 	fprintf_filtered (stream, "%d",
 			  (TYPE_LENGTH (type)