Index: gdb-8.2/gdb/breakpoint.c
===================================================================
--- gdb-8.2.orig/gdb/breakpoint.c
+++ gdb-8.2/gdb/breakpoint.c
@@ -4339,7 +4339,7 @@ bpstat_clear_actions (void)
   if (inferior_ptid == null_ptid)
     return;
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
   for (bs = tp->control.stop_bpstat; bs != NULL; bs = bs->next)
     {
       bs->commands = NULL;
@@ -4470,13 +4470,13 @@ bpstat_do_actions_1 (bpstat *bsp)
 /* Helper for bpstat_do_actions.  Get the current thread, if there's
    one, is alive and has execution.  Return NULL otherwise.  */
 
-static thread_info *
+static struct thread_info *
 get_bpstat_thread ()
 {
   if (inferior_ptid == null_ptid || !target_has_execution)
     return NULL;
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
   if (tp->state == THREAD_EXITED || tp->executing)
     return NULL;
   return tp;
@@ -4486,7 +4486,7 @@ void
 bpstat_do_actions (void)
 {
   struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup ();
-  thread_info *tp;
+  struct thread_info *tp;
 
   /* Do any commands attached to breakpoint we are stopped at.  */
   while ((tp = get_bpstat_thread ()) != NULL)
@@ -5170,7 +5170,7 @@ bpstat_check_watchpoint (bpstat bs)
    breakpoint, set BS->stop to 0.  */
 
 static void
-bpstat_check_breakpoint_conditions (bpstat bs, thread_info *thread)
+bpstat_check_breakpoint_conditions (bpstat bs, struct thread_info *thread)
 {
   const struct bp_location *bl;
   struct breakpoint *b;
@@ -5402,7 +5402,7 @@ build_bpstat_chain (const address_space
 
 bpstat
 bpstat_stop_status (const address_space *aspace,
-		    CORE_ADDR bp_addr, thread_info *thread,
+		    CORE_ADDR bp_addr, struct thread_info *thread,
 		    const struct target_waitstatus *ws,
 		    bpstat stop_chain)
 {