diff -uprN src0/gdb/ser-pipe.c src1/gdb/ser-pipe.c
--- src0/gdb/ser-pipe.c	2009-05-26 09:56:19.000000000 -0400
+++ src1/gdb/ser-pipe.c	2009-08-05 16:11:40.000000000 -0400
@@ -152,8 +152,6 @@ pipe_close (struct serial *scb)
     }
 }
 
-static struct serial_ops pipe_ops;
-
 void
 _initialize_ser_pipe (void)
 {
diff -uprN src0/gdb/ser-tcp.c src1/gdb/ser-tcp.c
--- src0/gdb/ser-tcp.c	2009-05-26 09:56:19.000000000 -0400
+++ src1/gdb/ser-tcp.c	2009-08-05 16:12:32.000000000 -0400
@@ -71,7 +71,7 @@ static int tcp_auto_retry = 1;
 
 /* Timeout period for connections, in seconds.  */
 
-static int tcp_retry_limit = 15;
+static unsigned int tcp_retry_limit = 15;
 
 /* how many times per second to poll deprecated_ui_loop_hook */
 
diff -uprN src0/gdb/serial.c src1/gdb/serial.c
--- src0/gdb/serial.c	2009-05-26 09:56:22.000000000 -0400
+++ src1/gdb/serial.c	2009-08-06 10:26:24.000000000 -0400
@@ -246,7 +246,6 @@ struct serial *
 serial_for_fd (int fd)
 {
   struct serial *scb;
-  struct serial_ops *ops;
 
   for (scb = scb_base; scb; scb = scb->next)
     if (scb->fd == fd)