diff -uprN src0/gdb/i386-nto-tdep.c src1/gdb/i386-nto-tdep.c
--- src0/gdb/i386-nto-tdep.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/i386-nto-tdep.c	2009-08-06 13:21:14.000000000 -0400
@@ -134,7 +134,6 @@ i386nto_register_area (struct gdbarch *g
 		       int regno, int regset, unsigned *off)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-  int len;
 
   *off = 0;
   if (regset == NTO_REG_GENERAL)
@@ -295,7 +294,7 @@ i386nto_sigcontext_addr (struct frame_in
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  char buf[4];
+  gdb_byte buf[4];
   CORE_ADDR ptrctx;
 
   /* We store __ucontext_t addr in EDI register.  */