p9y: fix includes

diff --git a/contrib/bin/memaslap/ms_setting.h b/contrib/bin/memaslap/ms_setting.h
index 51cab2f77e748ac144a009dbe71e88289744baed..dc0a108af5b8adc19f4caed4f32dda886f5a7952 100644 (file)
--- a/contrib/bin/memaslap/ms_setting.h
+++ b/contrib/bin/memaslap/ms_setting.h
@@ -18,6 +18,10 @@
 
 #include "ms_memslap.h"
 
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/p9y/poll.hpp b/src/p9y/poll.hpp
index 57fee463b274d3c60ad012528201b72cfe1401f2..bff0f1b72c3817a9b8243418e7b3133634be779d 100644 (file)
--- a/src/p9y/poll.hpp
+++ b/src/p9y/poll.hpp
@@ -2,10 +2,10 @@
 
 #include "libmemcached-1/platform.h"
 
-#if defined HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-#elif defined HAVE_POLL_H
+#if defined HAVE_POLL_H
 #  include <poll.h>
+#elif defined HAVE_SYS_POLL_H
+#  include <sys/poll.h>
 #elif defined _WIN32
 #  define poll WSAPoll
 typedef int nfds_t;

diff --git a/test/lib/Connection.cpp b/test/lib/Connection.cpp
index 806ce502e4f36889ee51c4aa9954c07328da1621..82414f135127d373588e37b67846365e3b599a2b 100644 (file)
--- a/test/lib/Connection.cpp
+++ b/test/lib/Connection.cpp
@@ -1,7 +1,7 @@
 #include "Connection.hpp"
+#include "p9y/poll.hpp"
 
 #include <cerrno>
-#include <sys/poll.h>
 #if HAVE_UNISTD_H
 #  include <unistd.h>
 #endif

diff --git a/test/lib/ForkAndExec.cpp b/test/lib/ForkAndExec.cpp
index 753e06ee88f680104886cc9cc1140f5e9324ef72..be994fc680efa82e7ed9a632f9ab969b5826b62c 100644 (file)
--- a/test/lib/ForkAndExec.cpp
+++ b/test/lib/ForkAndExec.cpp
@@ -1,9 +1,8 @@
 #include "ForkAndExec.hpp"
+#include "p9y/poll.hpp"
 
 #include <cstdio>
-
 #include <fcntl.h>
-#include <sys/poll.h>
 #if HAVE_UNISTD_H
 #  include <unistd.h>
 #endif