diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b20ff4362..44eaa19d90 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-28  Doug Evans  <dje@google.com>
+
+	* gdbtypes.c (lookup_typename): Rename local variable "tmp" to "type".
+
 2012-06-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* common/buffer.c: Include inttypes.h and stdint.h.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index e3db1ed5c5..0eec874bc8 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1140,15 +1140,15 @@ lookup_typename (const struct language_defn *language,
 		 const struct block *block, int noerr)
 {
   struct symbol *sym;
-  struct type *tmp;
+  struct type *type;
 
   sym = lookup_symbol (name, block, VAR_DOMAIN, 0);
   if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
     return SYMBOL_TYPE (sym);
 
-  tmp = language_lookup_primitive_type_by_name (language, gdbarch, name);
-  if (tmp)
-    return tmp;
+  type = language_lookup_primitive_type_by_name (language, gdbarch, name);
+  if (type)
+    return type;
 
   if (noerr)
     return NULL;