X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=have.h;h=d47f204cdc1bb45f0dbbd6fc28550d701080e6c2;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hp=92914ea010e11e0dfcac60c715e58b267b5eaab0;hpb=5c5548fc7185cc1462602dadcd39a53cef481d29;p=meshlink

diff --git a/have.h b/have.h
index 92914ea0..d47f204c 100644
--- 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
@@ -21,6 +21,15 @@
 #ifndef __TINC_HAVE_H__
 #define __TINC_HAVE_H__
 
+#ifdef HAVE_MINGW
+#ifdef WITH_WINDOWS2000
+#define WINVER Windows2000
+#else
+#define WINVER WindowsXP
+#endif
+#define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -32,13 +41,8 @@
 #include <unistd.h>
 
 #ifdef HAVE_MINGW
-#ifdef WITH_WINDOWS2000
-#define WINVER Windows2000
-#else
-#define WINVER WindowsXP
-#endif
-#define WIN32_LEAN_AND_MEAN
 #include <w32api.h>
+#include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
 #endif
@@ -55,10 +59,6 @@
 #include <inttypes.h>
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
 /* Include system specific headers */
 
 #ifdef HAVE_SYSLOG_H
@@ -97,6 +97,10 @@
 #include <sys/param.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
@@ -105,6 +109,10 @@
 #include <sys/un.h>
 #endif
 
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
 /* SunOS really wants sys/socket.h BEFORE net/if.h,
    and FreeBSD wants these lines below the rest. */
 
@@ -128,10 +136,18 @@
 #include <net/if_tun.h>
 #endif
 
+#ifdef HAVE_NET_TUN_IF_TUN_H
+#include <net/tun/if_tun.h>
+#endif
+
 #ifdef HAVE_NET_IF_TAP_H
 #include <net/if_tap.h>
 #endif
 
+#ifdef HAVE_NET_TAP_IF_TAP_H
+#include <net/tap/if_tap.h>
+#endif
+
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif