X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.h;h=368daaecbbbf2e18ab32b4e169ed7a9d429cc20d;hb=9d762a9c58fd0cfdd529002bf2b0ab6b2aaea2c3;hp=d150ff59096654d4d0ba99c73d2272ff8e8021bd;hpb=ef000040e699128edc8f04473165bbd3fc01f24d;p=awesomized%2Flibmemcached

diff --git a/libtest/cmdline.h b/libtest/cmdline.h
index d150ff59..368daaec 100644
--- a/libtest/cmdline.h
+++ b/libtest/cmdline.h
@@ -36,13 +36,7 @@
 
 #pragma once
 
-#ifdef _WIN32
-typedef int posix_spawn_file_actions_t;
-#else
-# include <spawn.h>
-#endif
-
-#include <pthread.h>
+#include <spawn.h>
 
 // http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
 #ifndef EXIT_SKIP
@@ -54,11 +48,11 @@ typedef int posix_spawn_file_actions_t;
 #endif
 
 #ifndef EX_NOEXEC
-#  define EX_NOEXEC 126
+# define EX_NOEXEC 126
 #endif
 
 #ifndef EX_NOTFOUND
-#  define EX_NOTFOUND 127
+# define EX_NOTFOUND 127
 #endif
 
 namespace libtest {
@@ -156,6 +150,11 @@ public:
     return _stdout_buffer.size();
   }
 
+  const char* stdout_c_str() const
+  {
+    return &_stdout_buffer[0];
+  }
+
   libtest::vchar_t stderr_result() const
   {
     return _stderr_buffer;
@@ -246,7 +245,4 @@ static inline std::ostream& operator<<(std::ostream& output, const enum Applicat
 
 int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false);
 
-const char *gearmand_binary(); 
-const char *drizzled_binary();
-
 }