Index: gdb-8.2/gdb/inline-frame.c
===================================================================
--- gdb-8.2.orig/gdb/inline-frame.c
+++ gdb-8.2/gdb/inline-frame.c
@@ -37,7 +37,7 @@
    keep our own list.  */
 struct inline_state
 {
-  inline_state (thread_info *thread_, int skipped_frames_, CORE_ADDR saved_pc_,
+  inline_state (struct thread_info *thread_, int skipped_frames_, CORE_ADDR saved_pc_,
 		symbol *skipped_symbol_)
     : thread (thread_), skipped_frames (skipped_frames_), saved_pc (saved_pc_),
       skipped_symbol (skipped_symbol_)
@@ -45,7 +45,7 @@ struct inline_state
 
   /* The thread this data relates to.  It should be a currently
      stopped thread.  */
-  thread_info *thread;
+  struct thread_info *thread;
 
   /* The number of inlined functions we are skipping.  Each of these
      functions can be stepped in to.  */
@@ -69,7 +69,7 @@ static std::vector<inline_state> inline_
    valid.  */
 
 static struct inline_state *
-find_inline_frame_state (thread_info *thread)
+find_inline_frame_state (struct thread_info *thread)
 {
   auto state_it = std::find_if (inline_states.begin (), inline_states.end (),
 				[thread] (const inline_state &state)
@@ -321,7 +321,7 @@ stopped_by_user_bp_inline_frame (const b
 /* See inline-frame.h.  */
 
 void
-skip_inline_frames (thread_info *thread, bpstat stop_chain)
+skip_inline_frames (struct thread_info *thread, bpstat stop_chain)
 {
   const struct block *frame_block, *cur_block;
   struct symbol *last_sym = NULL;
@@ -374,7 +374,7 @@ skip_inline_frames (thread_info *thread,
 /* Step into an inlined function by unhiding it.  */
 
 void
-step_into_inline_frame (thread_info *thread)
+step_into_inline_frame (struct thread_info *thread)
 {
   inline_state *state = find_inline_frame_state (thread);
 
@@ -387,7 +387,7 @@ step_into_inline_frame (thread_info *thr
    frame.  */
 
 int
-inline_skipped_frames (thread_info *thread)
+inline_skipped_frames (struct thread_info *thread)
 {
   inline_state *state = find_inline_frame_state (thread);
 
@@ -401,7 +401,7 @@ inline_skipped_frames (thread_info *thre
    the function inlined into the current frame.  */
 
 struct symbol *
-inline_skipped_symbol (thread_info *thread)
+inline_skipped_symbol (struct thread_info *thread)
 {
   inline_state *state = find_inline_frame_state (thread);