X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcommon.h;h=6c7e294c576aac4f99c3e63e45198dc81bcf94b1;hb=ad5cb8f903869065c72bb18bf98af6909189a5a9;hp=a9221916a6139f3ef34e9dc6dc2b361a35b2f4a4;hpb=47f45992107361ad58c170bdf78fdc92523fab06;p=awesomized%2Flibmemcached

diff --git a/libtest/common.h b/libtest/common.h
index a9221916..6c7e294c 100644
--- a/libtest/common.h
+++ b/libtest/common.h
@@ -46,23 +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>
+# include <fnmatch.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+
+#if defined(WIN32) || defined(__MINGW32__)
+# include "win32/wrappers.h"
+# define get_socket_errno() WSAGetLastError()
+#else
+# 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>
@@ -76,6 +93,7 @@
 
 #include <libtest/libtool.hpp>
 #include <libtest/killpid.h>
-#include <libtest/stats.h>
 #include <libtest/signal.h>
+#include <libtest/dns.hpp>
+#include <libtest/formatter.hpp>