diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0ba1827eed1..97934fa42b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-27  Tom Tromey  <tromey@redhat.com>
+
+	* c-exp.y (classify_name): Avoid assignment in condition.
+
 2012-07-27  Roland Schwingel  <roland.schwingel@onevision.com>
 
 	* amd64-windows-tdep.c: Include "frame.h".
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 5bcbb0e0597..e5b6d94a199 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -2747,8 +2747,8 @@ classify_name (struct block *block)
       if (Class)
 	{
 	  yylval.class.class = Class;
-	  if ((sym = lookup_struct_typedef (copy, expression_context_block,
-					    1)))
+	  sym = lookup_struct_typedef (copy, expression_context_block, 1);
+	  if (sym)
 	    yylval.class.type = SYMBOL_TYPE (sym);
 	  return CLASSNAME;
 	}