semver: 1.0 -> 1

[m6w6/libmemcached] / src / libmemcached / common.h

diff --git a/src/libmemcached/common.h b/src/libmemcached/common.h
index f9b20c4e725b12b6a676282adc9959fcf71880cf..ed878cb1329d00979705ee89504f40ab937c303f 100644 (file)
--- a/src/libmemcached/common.h
+++ b/src/libmemcached/common.h
@@ -26,6 +26,7 @@
 #  include <cctype>
 #  include <cerrno>
 #  include <climits>
+#  include <ciso646>
 #else
 #  include <stddef.h>
 #  include <stdio.h>
@@ -34,26 +35,16 @@
 #  include <time.h>
 #  include <errno.h>
 #  include <limits.h>
+#  include <iso646.h>
 #endif
 
-#ifdef HAVE_SYS_UN_H
-#  include <sys/un.h>
-#endif
+#include "p9y/socket.hpp"
 
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #endif
 
 #include <fcntl.h>
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
@@ -63,21 +54,11 @@
 #  include <dlfcn.h>
 #endif
 
-#if defined(_WIN32)
-#  include "libmemcached/windows.hpp"
-#endif
-
-#include "libmemcached-1.0/memcached.h"
+#include "libmemcached-1/memcached.h"
 #include "libmemcached/watchpoint.h"
 #include "libmemcached/is.h"
 typedef struct memcached_st Memcached;
 
-#ifdef HAVE_POLL_H
-#  include <poll.h>
-#else
-#  include "libmemcached/poll.h"
-#endif
-
 #ifdef __cplusplus
 memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
 #endif
@@ -88,11 +69,10 @@ memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t serv
 #include "libmemcached/io.h"
 #ifdef __cplusplus
 #  include "libmemcached/string.hpp"
-#  include "libmemcachedprotocol-0.0/binary.h"
+#  include "libmemcachedprotocol-0/binary.h"
 #  include "libmemcached/io.hpp"
 #  include "libmemcached/udp.hpp"
 #  include "libmemcached/do.hpp"
-#  include "libmemcached/socket.hpp"
 #  include "libmemcached/connect.hpp"
 #  include "libmemcached/allocators.hpp"
 #  include "libmemcached/hash.hpp"
@@ -153,6 +133,7 @@ extern "C" {
 memcached_return_t run_distribution(memcached_st *ptr);
 
 #ifdef __cplusplus
+#  include "p9y/poll.hpp"
 static inline void memcached_server_response_increment(memcached_instance_st *instance) {
   instance->events(POLLIN);
   instance->cursor_active_++;