projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update from libtest tree.
[m6w6/libmemcached]
/
clients
/
memcapable.cc
diff --git
a/clients/memcapable.cc
b/clients/memcapable.cc
index 99ca5ea77c30cda16e953e6caa8a24a05ae1a9a9..9dff427eb3c2c9c88e8c5463569aa895ca8d65d6 100644
(file)
--- a/
clients/memcapable.cc
+++ b/
clients/memcapable.cc
@@
-12,25
+12,32
@@
/* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
#undef NDEBUG
/* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
#undef NDEBUG
-#include "config.h"
-#include <pthread.h>
-#include <sys/types.h>
+#include <config.h>
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+#include "poll/poll.h"
+#endif
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
#include <fcntl.h>
#include <fcntl.h>
+#include <inttypes.h>
+#include <pthread.h>
#include <signal.h>
#include <signal.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
-#include <assert.h>
#include <string.h>
#include <string.h>
-#include <inttypes.h>
-#include <stdbool.h>
+#include <sys/types.h>
#include <unistd.h>
#include <unistd.h>
-#include <ctype.h>
#include <libmemcached/memcached.h>
#include <libmemcached/memcached/protocol_binary.h>
#include <libmemcached/byteorder.h>
#include <libmemcached/memcached.h>
#include <libmemcached/memcached/protocol_binary.h>
#include <libmemcached/byteorder.h>
-#include
"utilities.h"
+#include
<clients/utilities.h>
#ifdef linux
/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to
#ifdef linux
/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to