diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d52404d373..497e3a3335 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-25  Tom Tromey  <tromey@redhat.com>
+
+	* gdbtypes.h (CHECK_TYPEDEF): Don't yield a value.
+	* stack.c (print_this_frame_argument_p): Use check_typedef.
+
 2009-03-25  Tom Tromey  <tromey@redhat.com>
 
 	* configure: Rebuild.
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 816a2087c6..3c4e948211 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1185,7 +1185,10 @@ extern struct type *lookup_signed_typename (char *);
 
 extern struct type *check_typedef (struct type *);
 
-#define CHECK_TYPEDEF(TYPE) (TYPE) = check_typedef (TYPE)
+#define CHECK_TYPEDEF(TYPE)			\
+  do {						\
+    (TYPE) = check_typedef (TYPE);		\
+  } while (0)
 
 extern void check_stub_method_group (struct type *, int);
 
diff --git a/gdb/stack.c b/gdb/stack.c
index 8146979cc4..bf9e5762dd 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -181,9 +181,9 @@ print_this_frame_argument_p (struct symbol *sym)
   /* The user asked to print only the scalar arguments, so do not
      print the non-scalar ones.  */
 
-  type = CHECK_TYPEDEF (SYMBOL_TYPE (sym));
+  type = check_typedef (SYMBOL_TYPE (sym));
   while (TYPE_CODE (type) == TYPE_CODE_REF)
-    type = CHECK_TYPEDEF (TYPE_TARGET_TYPE (type));
+    type = check_typedef (TYPE_TARGET_TYPE (type));
   switch (TYPE_CODE (type))
     {
       case TYPE_CODE_ARRAY: