Index: gdb-8.2/gdb/dummy-frame.h
===================================================================
--- gdb-8.2.orig/gdb/dummy-frame.h
+++ gdb-8.2/gdb/dummy-frame.h
@@ -35,7 +35,7 @@ struct frame_unwind;
 
 extern void dummy_frame_push (infcall_suspend_state *caller_state,
 			      const frame_id *dummy_id,
-			      thread_info *thread);
+			      struct thread_info *thread);
 
 /* Pop the dummy frame DUMMY_ID, restoring program state to that before the
    frame was created.
@@ -46,9 +46,9 @@ extern void dummy_frame_push (infcall_su
    stack, because the other frames may be for different threads, and there's
    currently no way to tell which stack frame is for which thread.  */
 
-extern void dummy_frame_pop (frame_id dummy_id, thread_info *thread);
+extern void dummy_frame_pop (frame_id dummy_id, struct thread_info *thread);
 
-extern void dummy_frame_discard (frame_id dummy_id, thread_info *thread);
+extern void dummy_frame_discard (frame_id dummy_id, struct thread_info *thread);
 
 /* If the PC falls in a dummy frame, return a dummy frame
    unwinder.  */
@@ -64,7 +64,7 @@ typedef void (dummy_frame_dtor_ftype) (v
    destructors may be registered, they will be called in the reverse
    order of registrations (LIFO).  */
 extern void register_dummy_frame_dtor (frame_id dummy_id,
-				       thread_info *thread,
+				       struct thread_info *thread,
 				       dummy_frame_dtor_ftype *dtor,
 				       void *dtor_data);