projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
33b1be8
)
Update for compiling on OSX.
author
Brian Aker
<brian@tangent.org>
Mon, 9 Apr 2012 18:05:59 +0000
(11:05 -0700)
committer
Brian Aker
<brian@tangent.org>
Mon, 9 Apr 2012 18:05:59 +0000
(11:05 -0700)
configure.ac
patch
|
blob
|
history
libtest/cmdline.cc
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index d24d519f434fe8f9a0671151b8fb2702bbe69a07..de2bc88159b38238939fb2597a385157a4cd5fd0 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-107,6
+107,7
@@
AC_CHECK_FUNCS([gettimeofday])
AC_CHECK_FUNCS([memchr])
AC_CHECK_FUNCS([memmove])
AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([pipe2])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
AC_CHECK_FUNCS([socket])
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index 6fc34031b95b319ce121b0a62fe54f8c14292a5f..de7c89d70891e287e3aebb3e5bb366bdf469bce4 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-36,6
+36,11
@@
using namespace libtest;
#include <string>
#include <sys/stat.h>
#include <sys/types.h>
+#include <unistd.h>
+
+#ifndef __USE_GNU
+static char **environ= NULL;
+#endif
extern "C" {
static int exited_successfully(int status)
@@
-533,7
+538,7
@@
void Application::Pipe::reset()
close(READ);
close(WRITE);
-#if
_GNU_SOURCE
+#if
HAVE_PIPE2
if (pipe2(_pipe_fd, O_NONBLOCK) == -1)
#else
if (pipe(_pipe_fd) == -1)