projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update from latest ddm4
[awesomized/libmemcached]
/
libtest
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index f43b1c28b72ca970d679e0b274ca5faa7ddc7628..5c3d09f2960487a8169d9b57ab807aa681193120 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-110,7
+110,6
@@
namespace {
}
#endif
}
#endif
-
static Application::error_t int_to_error_t(int arg)
{
switch (arg)
static Application::error_t int_to_error_t(int arg)
{
switch (arg)
@@
-459,7
+458,6
@@
Application::error_t Application::wait(bool nohang)
if (exit_code == Application::INVALID)
{
Error << print_argv(built_argv, _argc);
if (exit_code == Application::INVALID)
{
Error << print_argv(built_argv, _argc);
- /
}
#endif
}
#endif
@@
-516,11
+514,13
@@
Application::error_t Application::join()
slurp();
slurp();
+#if 0
if (exit_code == Application::INVALID)
{
if (exit_code == Application::INVALID)
{
- Error << print_argv(built_argv);
+ Error << print_argv(built_argv
, _argc
);
}
}
-;
+#endif
+
return exit_code;
}
return exit_code;
}
@@
-623,7
+623,7
@@
void Application::Pipe::reset()
close(READ);
close(WRITE);
close(READ);
close(WRITE);
-#if HAVE_PIPE2
+#if
defined(HAVE_PIPE2) &&
HAVE_PIPE2
if (pipe2(_pipe_fd, O_NONBLOCK) == -1)
#else
if (pipe(_pipe_fd) == -1)
if (pipe2(_pipe_fd, O_NONBLOCK) == -1)
#else
if (pipe(_pipe_fd) == -1)