Merge branch 'master' into 1.1

[meshlink] / have.h

diff --git a/have.h b/have.h
index cf5c173a107af5ad6588107fd310e9c9f875516e..89454feba1e92cf46db611f3d3271b42ebb45002 100644 (file)
--- a/have.h
+++ b/have.h
@@ -37,6 +37,7 @@
 #else
 #define WINVER WindowsXP
 #endif
+#define WIN32_LEAN_AND_MEAN
 #include <w32api.h>
 #include <windows.h>
 #include <ws2tcpip.h>
@@ -68,6 +69,10 @@
 #include <sys/time.h>
 #endif
 
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -96,6 +101,10 @@
 #include <sys/uio.h>
 #endif
 
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -175,4 +184,8 @@
 #include <netinet/if_ether.h>
 #endif
 
+#ifdef HAVE_EVENT_H
+#include <event.h>
+#endif
+
 #endif /* __TINC_SYSTEM_H__ */