X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fprogspace-and-thread.c;h=3c92b5c8e045e33bd032a152684910eedf7afd65;hb=be6d4f74c77c6f521afc873d226480e001cb99c2;hp=a48faa0f960554aacb0b3708c61803e9251d575d;hpb=5ed8105e02d0c6648b7faea9f4e941237b932717;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
index a48faa0f96..3c92b5c8e0 100644
--- a/gdb/progspace-and-thread.c
+++ b/gdb/progspace-and-thread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,6 +17,7 @@
 
 #include "defs.h"
 #include "progspace-and-thread.h"
+#include "inferior.h"
 
 /* See progspace-and-thread.h  */
 
@@ -27,17 +28,17 @@ switch_to_program_space_and_thread (program_space *pspace)
 
   if (inf != NULL && inf->pid != 0)
     {
-      thread_info *tp = any_live_thread_of_process (inf->pid);
+      thread_info *tp = any_live_thread_of_inferior (inf);
 
       if (tp != NULL)
 	{
-	  switch_to_thread (tp->ptid);
+	  switch_to_thread (tp);
 	  /* Switching thread switches pspace implicitly.  We're
 	     done.  */
 	  return;
 	}
     }
 
-  switch_to_thread (null_ptid);
+  switch_to_no_thread ();
   set_current_program_space (pspace);
 }