X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fcommon.h;h=c36384b2aafc170654a8e3a19d90577c7bdeccfb;hb=8691d09c0c8905ce8624fbd60dea859f65ecc22a;hp=4b025fb368c2d6de8181fb63eeb4655846148fce;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/common.h b/src/libmemcached/common.h
index 4b025fb3..c36384b2 100644
--- a/src/libmemcached/common.h
+++ b/src/libmemcached/common.h
@@ -26,51 +26,25 @@
 #  include <cctype>
 #  include <cerrno>
 #  include <climits>
+#  include <ciso646>
 #else
-#  ifdef HAVE_STDDEF_H
-#    include <stddef.h>
-#  endif
-#  ifdef HAVE_STDLIB_H
-#    include <stdio.h>
-#  endif
-#  ifdef HAVE_STDLIB_H
-#    include <stdlib.h>
-#  endif
+#  include <stddef.h>
+#  include <stdio.h>
+#  include <stdlib.h>
 #  include <string.h>
-#  ifdef HAVE_TIME_H
-#    include <time.h>
-#  endif
-#  ifdef HAVE_ERRNO_H
-#    include <errno.h>
-#  endif
-#  ifdef HAVE_LIMITS_H
-#    include <limits.h>
-#  endif
+#  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
 
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
+#include <fcntl.h>
 
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
@@ -80,21 +54,11 @@
 #  include <dlfcn.h>
 #endif
 
-#if defined(_WIN32)
-#  include "libmemcached/windows.hpp"
-#endif
-
 #include "libmemcached-1.0/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
@@ -109,7 +73,6 @@ memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t serv
 #  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"
@@ -170,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_++;