X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcommon.h;h=6c7e294c576aac4f99c3e63e45198dc81bcf94b1;hb=9065046a3fd404f72fb090cb0da65cfa8443032f;hp=498baf341a5e4235a746fc78268a20394a063507;hpb=72d630c2835020db3027fe7b185ad25e8a98aabc;p=awesomized%2Flibmemcached

diff --git a/libtest/common.h b/libtest/common.h
index 498baf34..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>
@@ -78,4 +95,5 @@
 #include <libtest/killpid.h>
 #include <libtest/signal.h>
 #include <libtest/dns.hpp>
+#include <libtest/formatter.hpp>