X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcommon.h;h=6c7e294c576aac4f99c3e63e45198dc81bcf94b1;hb=cdca8cca3bd30c5424793b202551c84123e7129b;hp=20b482586402820dcf041e7e78665eb6a00575c1;hpb=6b04196d0ea6aa9fcd2a6c14a6cb5733c34aa2d2;p=awesomized%2Flibmemcached

diff --git a/libtest/common.h b/libtest/common.h
index 20b48258..6c7e294c 100644
--- a/libtest/common.h
+++ b/libtest/common.h
@@ -46,45 +46,40 @@
 #include <string>
 
 #ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+# include <sys/types.h>
 #endif
 
 #ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+# include <sys/wait.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H 
-#include <sys/resource.h> 
+# include <sys/resource.h> 
 #endif
  
 #ifdef HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
+# include <fnmatch.h>
 #endif
 
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
 
-#ifdef HAVE_POLL_H
-# include <poll.h>
+#if defined(WIN32) || defined(__MINGW32__)
+# include "win32/wrappers.h"
+# define get_socket_errno() WSAGetLastError()
 #else
-# include "poll/poll.h"
-#endif
-
-#ifdef HAVE_SPAWN_H
-# include <spawn.h>
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+# define INVALID_SOCKET -1
+# define SOCKET_ERROR -1
+# define closesocket(a) close(a)
+# define get_socket_errno() errno
 #endif
 
 #include <libtest/test.hpp>