Merge branch 'master' into 1.1

[meshlink] / have.h

diff --git a/have.h b/have.h
index 45acb36183ca1f228c365616488f7754985d0860..e0652a9daf41df4dfa34daefade0d7d43369fd0e 100644 (file)
--- a/have.h
+++ b/have.h
@@ -1,7 +1,7 @@
 /*
     have.h -- include headers which are known to exist
-    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2003-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2003-2006 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
@@ -43,6 +43,10 @@
 #include <inttypes.h>
 #endif
 
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 /* Include system specific headers */
 
 #ifdef HAVE_SYSLOG_H
@@ -53,6 +57,10 @@
 #include <sys/time.h>
 #endif
 
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -161,4 +169,8 @@
 #include <winsock2.h>
 #endif
 
+#ifdef HAVE_LIBEVENT
+#include <event.h>
+#endif
+
 #endif /* __TINC_SYSTEM_H__ */