diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e90ee925a3..f294ea85bb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  Randolph Chung  <tausq@debian.org>
+
+	* frame.c (get_prev_frame): Use get_frame_type to retrieve the 
+    frame's type.
+
 2004-11-10  Randolph Chung  <tausq@debian.org>
 
 	* blockframe.c (inside_entry_func): Move to .....
diff --git a/gdb/frame.c b/gdb/frame.c
index d0d77f50a4..25b32f4915 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1239,7 +1239,7 @@ get_prev_frame (struct frame_info *this_frame)
      stop at main, we should at least stop at the entry point of the
      application.  */
   if (!backtrace_past_entry
-      && this_frame->unwind->type != DUMMY_FRAME && this_frame->level >= 0
+      && get_frame_type (this_frame) != DUMMY_FRAME && this_frame->level >= 0
       && inside_entry_func (this_frame))
     {
       frame_debug_got_null_frame (gdb_stdlog, this_frame, "inside entry func");