diff -uprN src0/gdb/cp-name-parser.y src1/gdb/cp-name-parser.y
--- src0/gdb/cp-name-parser.y	2009-07-31 14:43:25.000000000 -0400
+++ src1/gdb/cp-name-parser.y	2009-08-05 16:45:39.000000000 -0400
@@ -1541,7 +1541,7 @@ yylex (void)
 {
   int c;
   int namelen;
-  const char *tokstart, *tokptr;
+  const char *tokstart;
 
  retry:
   prev_lexptr = lexptr;
diff -uprN src0/gdb/cp-namespace.c src1/gdb/cp-namespace.c
--- src0/gdb/cp-namespace.c	2009-07-09 17:20:15.000000000 -0400
+++ src1/gdb/cp-namespace.c	2009-08-06 13:38:52.000000000 -0400
@@ -32,9 +32,6 @@
 #include "frame.h"
 #include "buildsym.h"
 
-static struct using_direct *cp_copy_usings (struct using_direct *using,
-					    struct obstack *obstack);
-
 static struct symbol *lookup_namespace_scope (const char *name,
 					      const char *linkage_name,
 					      const struct block *block,
@@ -85,7 +82,6 @@ cp_scan_for_anonymous_namespaces (const 
       const char *name = SYMBOL_DEMANGLED_NAME (symbol);
       unsigned int previous_component;
       unsigned int next_component;
-      const char *len;
 
       /* Start with a quick-and-dirty check for mention of "(anonymous
 	 namespace)".  */
@@ -137,7 +133,6 @@ void
 cp_add_using_directive (const char *dest, const char *src)
 {
   struct using_direct *current;
-  struct using_direct *new;
 
   /* Has it already been added?  */
 
@@ -221,36 +216,6 @@ cp_add_using (const char *dest,
   return retval;
 }
 
-/* Make a copy of the using directives in the list pointed to by
-   USING, using OBSTACK to allocate memory.  Free all memory pointed
-   to by USING via xfree.  */
-
-static struct using_direct *
-cp_copy_usings (struct using_direct *using,
-		struct obstack *obstack)
-{
-  if (using == NULL)
-    {
-      return NULL;
-    }
-  else
-    {
-      struct using_direct *retval
-	= obstack_alloc (obstack, sizeof (struct using_direct));
-      retval->import_src = obsavestring (using->import_src, strlen (using->import_src),
-				    obstack);
-      retval->import_dest = obsavestring (using->import_dest, strlen (using->import_dest),
-				    obstack);
-      retval->next = cp_copy_usings (using->next, obstack);
-
-      xfree (using->import_src);
-      xfree (using->import_dest);
-      xfree (using);
-
-      return retval;
-    }
-}
-
 /* The C++-specific version of name lookup for static and global
    names.  This makes sure that names get looked for in all namespaces
    that are in scope.  NAME is the natural name of the symbol that
diff -uprN src0/gdb/cp-support.c src1/gdb/cp-support.c
--- src0/gdb/cp-support.c	2009-07-09 17:20:15.000000000 -0400
+++ src1/gdb/cp-support.c	2009-08-06 10:30:20.000000000 -0400
@@ -143,7 +143,6 @@ mangled_name_to_comp (const char *mangle
 {
   struct demangle_component *ret;
   char *demangled_name;
-  int len;
 
   /* If it looks like a v3 mangled name, then try to go directly
      to trees.  */
@@ -327,7 +326,6 @@ method_name_from_physname (const char *p
   void *storage = NULL;
   char *demangled_name = NULL, *ret;
   struct demangle_component *ret_comp;
-  int done;
 
   ret_comp = mangled_name_to_comp (physname, DMGL_ANSI, &storage,
 				   &demangled_name);
@@ -358,7 +356,6 @@ cp_func_name (const char *full_name)
 {
   char *ret;
   struct demangle_component *ret_comp;
-  int done;
 
   ret_comp = cp_demangled_name_to_comp (full_name, NULL);
   if (!ret_comp)
diff -uprN src0/gdb/cp-valprint.c src1/gdb/cp-valprint.c
--- src0/gdb/cp-valprint.c	2009-07-06 09:28:17.000000000 -0400
+++ src1/gdb/cp-valprint.c	2009-08-06 10:25:06.000000000 -0400
@@ -591,7 +591,7 @@ cp_print_class_member (const gdb_byte *v
       return;
     }
 
-  cp_find_class_member (&domain, &fieldno, val << 3);
+  cp_find_class_member (&domain, (int *)&fieldno, val << 3);
 
   if (domain != NULL)
     {
diff -uprN src0/gdb/demangle.c src1/gdb/demangle.c
--- src0/gdb/demangle.c	2009-05-26 09:56:22.000000000 -0400
+++ src1/gdb/demangle.c	2009-08-06 09:37:06.000000000 -0400
@@ -177,7 +177,6 @@ is_cplus_marker (int c)
 void
 _initialize_demangler (void)
 {
-  struct cmd_list_element *set, *show;
   int i, ndems;
 
   /* Fill the demangling_style_names[] array.  */