Index: gdb-8.2/gdb/record-btrace.c
===================================================================
--- gdb-8.2.orig/gdb/record-btrace.c
+++ gdb-8.2/gdb/record-btrace.c
@@ -250,7 +250,7 @@ require_btrace_thread (void)
   if (inferior_ptid == null_ptid)
     error (_("No thread."));
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
 
   validate_registers_access ();
 
@@ -353,11 +353,11 @@ struct scoped_btrace_disable
 
   ~scoped_btrace_disable ()
   {
-    for (thread_info *tp : m_threads)
+    for (struct thread_info *tp : m_threads)
       btrace_disable (tp);
   }
 
-  void add_thread (thread_info *thread)
+  void add_thread (struct thread_info *thread)
   {
     m_threads.push_front (thread);
   }
@@ -368,7 +368,7 @@ struct scoped_btrace_disable
   }
 
 private:
-  std::forward_list<thread_info *> m_threads;
+  std::forward_list<struct thread_info *> m_threads;
 };
 
 /* Open target record-btrace.  */
@@ -2513,8 +2513,8 @@ record_btrace_step_thread (struct thread
 
 static void
 record_btrace_maybe_mark_async_event
-  (const std::vector<thread_info *> &moving,
-   const std::vector<thread_info *> &no_history)
+  (const std::vector<struct thread_info *> &moving,
+   const std::vector<struct thread_info *> &no_history)
 {
   bool more_moving = !moving.empty ();
   bool more_no_history = !no_history.empty ();;
@@ -2537,8 +2537,8 @@ ptid_t
 record_btrace_target::wait (ptid_t ptid, struct target_waitstatus *status,
 			    int options)
 {
-  std::vector<thread_info *> moving;
-  std::vector<thread_info *> no_history;
+  std::vector<struct thread_info *> moving;
+  std::vector<struct thread_info *> no_history;
 
   DEBUG ("wait %s (0x%x)", target_pid_to_str (ptid), options);
 
@@ -2551,7 +2551,7 @@ record_btrace_target::wait (ptid_t ptid,
 
   /* Keep a work list of moving threads.  */
   {
-    thread_info *tp;
+    struct thread_info *tp;
 
     ALL_NON_EXITED_THREADS (tp)
       {
@@ -2593,7 +2593,7 @@ record_btrace_target::wait (ptid_t ptid,
     {
       for (unsigned int ix = 0; eventing == NULL && ix < moving.size ();)
 	{
-	  thread_info *tp = moving[ix];
+	  struct thread_info *tp = moving[ix];
 
 	  *status = record_btrace_step_thread (tp);
 
@@ -2640,7 +2640,7 @@ record_btrace_target::wait (ptid_t ptid,
   /* Stop all other threads. */
   if (!target_is_non_stop_p ())
     {
-      thread_info *tp;
+      struct thread_info *tp;
 
       ALL_NON_EXITED_THREADS (tp)
 	record_btrace_cancel_resume (tp);