Index: gdb-8.2/gdb/dummy-frame.c
===================================================================
--- gdb-8.2.orig/gdb/dummy-frame.c
+++ gdb-8.2/gdb/dummy-frame.c
@@ -37,7 +37,7 @@ struct dummy_frame_id
   struct frame_id id;
 
   /* The thread this dummy_frame relates to.  */
-  thread_info *thread;
+  struct thread_info *thread;
 };
 
 /* Return whether dummy_frame_id *ID1 and *ID2 are equal.  */
@@ -89,7 +89,7 @@ static struct dummy_frame *dummy_frame_s
 
 void
 dummy_frame_push (struct infcall_suspend_state *caller_state,
-		  const frame_id *dummy_id, thread_info *thread)
+		  const frame_id *dummy_id, struct thread_info *thread)
 {
   struct dummy_frame *dummy_frame;
 
@@ -202,7 +202,7 @@ lookup_dummy_frame (struct dummy_frame_i
    If the frame isn't found, flag an internal error.  */
 
 void
-dummy_frame_pop (frame_id dummy_id, thread_info *thread)
+dummy_frame_pop (frame_id dummy_id, struct thread_info *thread)
 {
   struct dummy_frame **dp;
   struct dummy_frame_id id = { dummy_id, thread };
@@ -218,7 +218,7 @@ dummy_frame_pop (frame_id dummy_id, thre
    free its memory.  */
 
 void
-dummy_frame_discard (struct frame_id dummy_id, thread_info *thread)
+dummy_frame_discard (struct frame_id dummy_id, struct thread_info *thread)
 {
   struct dummy_frame **dp;
   struct dummy_frame_id id = { dummy_id, thread };
@@ -231,7 +231,7 @@ dummy_frame_discard (struct frame_id dum
 /* See dummy-frame.h.  */
 
 void
-register_dummy_frame_dtor (frame_id dummy_id, thread_info *thread,
+register_dummy_frame_dtor (frame_id dummy_id, struct thread_info *thread,
 			   dummy_frame_dtor_ftype *dtor, void *dtor_data)
 {
   struct dummy_frame_id id = { dummy_id, thread };