projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
p9y: fix includes
[m6w6/libmemcached]
/
test
/
lib
/
ForkAndExec.cpp
diff --git
a/test/lib/ForkAndExec.cpp
b/test/lib/ForkAndExec.cpp
index 48a8dc18bac36621cedfd50d7ef5f1ae9ae7df66..be994fc680efa82e7ed9a632f9ab969b5826b62c 100644
(file)
--- a/
test/lib/ForkAndExec.cpp
+++ b/
test/lib/ForkAndExec.cpp
@@
-1,10
+1,12
@@
#include "ForkAndExec.hpp"
#include "ForkAndExec.hpp"
+#include "p9y/poll.hpp"
#include <cstdio>
#include <cstdio>
-
#include <fcntl.h>
#include <fcntl.h>
-#include <sys/poll.h>
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <spawn.h>
#if !HAVE_PIPE2
static inline int setfl(int fd, int newflags) {
#if !HAVE_PIPE2
static inline int setfl(int fd, int newflags) {
@@
-107,7
+109,7
@@
void ForkAndExec::closePipe(int &fd) {
}
void ForkAndExec::pollExecReadyPipe() {
}
void ForkAndExec::pollExecReadyPipe() {
-#if __APPLE__
|| __FreeBSD__
+#if __APPLE__
char c, n = 50;
do {
if (0 == read(ready[mode::READ], &c, 1)) {
char c, n = 50;
do {
if (0 == read(ready[mode::READ], &c, 1)) {