Index: gdb-8.2/gdb/infrun.c
===================================================================
--- gdb-8.2.orig/gdb/infrun.c
+++ gdb-8.2/gdb/infrun.c
@@ -694,7 +694,7 @@ follow_fork (void)
 	     target to follow it (in either direction).  We'll
 	     afterwards refuse to resume, and inform the user what
 	     happened.  */
-	  thread_info *wait_thread
+	  struct thread_info *wait_thread
 	    = find_thread_ptid (wait_ptid);
 	  switch_to_thread (wait_thread);
 	  should_resume = 0;
@@ -767,7 +767,7 @@ follow_fork (void)
 	    /* If we followed the child, switch to it...  */
 	    if (follow_child)
 	      {
-		thread_info *child_thr = find_thread_ptid (child);
+		struct thread_info *child_thr = find_thread_ptid (child);
 		switch_to_thread (child_thr);
 
 		/* ... and preserve the stepping state, in case the
@@ -1493,7 +1493,7 @@ struct displaced_step_inferior_state
   /* If this is not nullptr, this is the thread carrying out a
      displaced single-step in process PID.  This thread's state will
      require fixing up once it has completed its step.  */
-  thread_info *step_thread;
+  struct thread_info *step_thread;
 
   /* The architecture the thread had when we stepped it.  */
   struct gdbarch *step_gdbarch;
@@ -1551,7 +1551,7 @@ displaced_step_in_progress_any_inferior
    step.  */
 
 static int
-displaced_step_in_progress_thread (thread_info *thread)
+displaced_step_in_progress_thread (struct thread_info *thread)
 {
   struct displaced_step_inferior_state *displaced;
 
@@ -1746,7 +1746,7 @@ displaced_step_dump_bytes (struct ui_fil
    if this instruction can't be displaced stepped.  */
 
 static int
-displaced_step_prepare_throw (thread_info *tp)
+displaced_step_prepare_throw (struct thread_info *tp)
 {
   struct cleanup *ignore_cleanups;
   regcache *regcache = get_thread_regcache (tp);
@@ -1885,7 +1885,7 @@ displaced_step_prepare_throw (thread_inf
    attempts at displaced stepping if we get a memory error.  */
 
 static int
-displaced_step_prepare (thread_info *thread)
+displaced_step_prepare (struct thread_info *thread)
 {
   int prepared = -1;
 
@@ -1960,7 +1960,7 @@ displaced_step_restore (struct displaced
    -1.  If the thread wasn't displaced stepping, return 0.  */
 
 static int
-displaced_step_fixup (thread_info *event_thread, enum gdb_signal signal)
+displaced_step_fixup (struct thread_info *event_thread, enum gdb_signal signal)
 {
   struct cleanup *old_cleanups;
   struct displaced_step_inferior_state *displaced
@@ -4751,7 +4751,7 @@ handle_no_resumed (struct execution_cont
       if (inf->pid == 0)
 	continue;
 
-      thread_info *thread = any_live_thread_of_inferior (inf);
+      struct thread_info *thread = any_live_thread_of_inferior (inf);
       if (thread == NULL)
 	{
 	  if (debug_infrun)
@@ -5212,8 +5212,8 @@ Cannot fill $_exitsignal with the correc
 
 	  should_resume = follow_fork ();
 
-	  thread_info *parent = ecs->event_thread;
-	  thread_info *child = find_thread_ptid (ecs->ws.value.related_pid);
+	  struct thread_info *parent = ecs->event_thread;
+	  struct thread_info *child = find_thread_ptid (ecs->ws.value.related_pid);
 
 	  /* At this point, the parent is marked running, and the
 	     child is marked stopped.  */