X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fhave.h;h=11fa56adb3f30d144a7026a74f0a2cfcca2266e2;hp=e00c7f7194f046f57d8f2d447893ead48417f319;hb=600b653da1c2706aef7b28af873794a05127c64f;hpb=68f4ca711593416d0defd81199b176ba604c6cb1

diff --git a/src/have.h b/src/have.h
index e00c7f71..11fa56ad 100644
--- a/src/have.h
+++ b/src/have.h
@@ -1,7 +1,10 @@
+#ifndef TINC_HAVE_H
+#define TINC_HAVE_H
+
 /*
     have.h -- include headers which are known to exist
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2015 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
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_HAVE_H__
-#define __TINC_HAVE_H__
-
 #ifdef HAVE_MINGW
 #ifdef WITH_WINDOWS2000
 #define WINVER Windows2000
@@ -30,14 +30,19 @@
 #endif
 
 #include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
-#include <signal.h>
 #include <errno.h>
+#include <limits.h>
+
 #include <fcntl.h>
 #include <unistd.h>
+#include <signal.h>
 
 #ifdef HAVE_MINGW
 #include <w32api.h>
@@ -54,10 +59,6 @@
 #include <termios.h>
 #endif
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
@@ -195,4 +196,19 @@
 #include <netinet/if_ether.h>
 #endif
 
-#endif /* __TINC_SYSTEM_H__ */
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#ifdef STATUS
+#undef STATUS
+#endif
+#endif
+
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
+#ifdef HAVE_LINUX_IF_TUN_H
+#include <linux/if_tun.h>
+#endif
+
+#endif