Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / have.h

diff --git a/have.h b/have.h
index 9e154d6600fa47984ccd5e85c2337d823b3c611f..de0091028924a1e6a000de422bba46b7fec67e43 100644 (file)
--- a/have.h
+++ b/have.h
@@ -1,7 +1,7 @@
 /*
     have.h -- include headers which are known to exist
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2011 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #else
 #define WINVER WindowsXP
 #endif
+#define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <stdio.h>
@@ -71,6 +72,10 @@
 #include <sys/time.h>
 #endif
 
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -103,6 +108,10 @@
 #include <sys/uio.h>
 #endif
 
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -190,4 +199,8 @@
 #include <netinet/if_ether.h>
 #endif
 
+#ifdef HAVE_EVENT_H
+#include <event.h>
+#endif
+
 #endif /* __TINC_SYSTEM_H__ */