X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.cc;h=e813eb592c4da4730350ff103ff1994b6bb1f213;hb=f9b9a7e7f7a25587bcd2bea5932122510003fcd8;hp=fd9e510ded50c12ca26f30eae018a9d85e460a42;hpb=2502dd7301613f0c8e278b10df139bb412fad928;p=m6w6%2Flibmemcached

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index fd9e510d..e813eb59 100644
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -59,6 +59,7 @@ using namespace libtest;
 #include <unistd.h>
 
 #include <algorithm>
+#include <stdexcept>
 
 #ifndef __USE_GNU
 static char **environ= NULL;
@@ -358,7 +359,7 @@ bool Application::slurp()
     int error;
     switch ((error= errno))
     {
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
     case ERESTART:
 #endif
     case EINTR:
@@ -408,7 +409,7 @@ bool Application::slurp()
 
 Application::error_t Application::join()
 {
-  pid_t waited_pid= waitpid(_pid, &_status, 0);
+  pid_t waited_pid= waitpid(_pid, &_status, WUNTRACED);
   slurp();
   if (waited_pid == _pid and WIFEXITED(_status) == false)
   {