Merge branch 'master' into 1.1

[meshlink] / have.h

diff --git a/have.h b/have.h
index 49af86165364df34d0603d009007371264421db2..92914ea010e11e0dfcac60c715e58b267b5eaab0 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>
@@ -100,6 +101,10 @@
 #include <sys/uio.h>
 #endif
 
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
 /* SunOS really wants sys/socket.h BEFORE net/if.h,
    and FreeBSD wants these lines below the rest. */
 
@@ -175,4 +180,8 @@
 #include <netinet/if_ether.h>
 #endif
 
+#ifdef HAVE_EVENT_H
+#include <event.h>
+#endif
+
 #endif /* __TINC_SYSTEM_H__ */