projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-63
[awesomized/libmemcached]
/
libtest
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index 3179d1928c89a07c101a57d2b5ce16172018deff..5c3d09f2960487a8169d9b57ab807aa681193120 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-82,7
+82,6
@@
extern "C" {
namespace {
namespace {
-#if 0
std::string print_argv(libtest::vchar_ptr_t& built_argv)
{
std::stringstream arg_buffer;
std::string print_argv(libtest::vchar_ptr_t& built_argv)
{
std::stringstream arg_buffer;
@@
-96,8
+95,8
@@
namespace {
return arg_buffer.str();
}
return arg_buffer.str();
}
-#endif
+#if 0
std::string print_argv(char** argv)
{
std::stringstream arg_buffer;
std::string print_argv(char** argv)
{
std::stringstream arg_buffer;
@@
-109,6
+108,7
@@
namespace {
return arg_buffer.str();
}
return arg_buffer.str();
}
+#endif
static Application::error_t int_to_error_t(int arg)
{
static Application::error_t int_to_error_t(int arg)
{
@@
-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)