2009-06-10 Jonas Maebe <jonas.maebe@elis.ugent.be>

	* darwin-nat.c (darwin_stop_inferior): Pass 0 as options to
	darwin_wait (blocking wait).
	(darwin_kill_inferior): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d97324ccde4c87a192b295ea68673209312588d..d9754e55c2d719d20052ef33fa85c6561c2ee2c6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-10  Jonas Maebe  <jonas.maebe@elis.ugent.be>
+
+       * darwin-nat.c (darwin_stop_inferior): Pass 0 as options to
+       darwin_wait (blocking wait).
+       (darwin_kill_inferior): Likewise.
+
 2009-06-10  Pedro Alves  <pedro@codesourcery.com>
 
        * infrun.c (handle_inferior_event): Update comment around trying

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 8c20bd905a02d415bc693ceb2d651a0ceb421ab5..3246881aaab90f4b2fcc7f8e5db0fcf65599d150 100644 (file)
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -688,7 +688,7 @@ darwin_stop_inferior (struct target_ops *ops, darwin_inferior *inf)
   if (res != 0)
     warning (_("cannot kill: %s\n"), safe_strerror (errno));
 
-  ptid = darwin_wait (ops, inferior_ptid, &wstatus);
+  ptid = darwin_wait (ops, inferior_ptid, &wstatus, 0);
   gdb_assert (wstatus.kind = TARGET_WAITKIND_STOPPED);
 }
 
@@ -720,7 +720,7 @@ darwin_kill_inferior (struct target_ops *ops)
   kret = task_resume (darwin_inf->task);
   MACH_CHECK_ERROR (kret);
 
-  ptid = darwin_wait (ops, inferior_ptid, &wstatus);
+  ptid = darwin_wait (ops, inferior_ptid, &wstatus, 0);
 
   /* This double wait seems required...  */
   res = waitpid (darwin_inf->pid, &status, 0);