X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fhave.h;h=96e35fd75fb5818bc92c1b5b61b4dd6431d53f88;hb=28b7a53b693f6b4e70218a926e68a36ece54cda1;hp=80f405e92c9e47d7f2d132d5528147321eed14c9;hpb=24d28adf64934c8d726959e25dce8c10dbd10d1f;p=tinc

diff --git a/src/have.h b/src/have.h
index 80f405e9..96e35fd7 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-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2021 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,21 +21,16 @@
     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
-#else
-#define WINVER WindowsXP
-#endif
+#define WINVER 0x0600
+#define _WIN32_WINNT 0x0600
 #define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <string.h>
 #include <ctype.h>
 #include <signal.h>
@@ -41,6 +39,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <math.h>
+#include <time.h>
 
 #ifdef HAVE_MINGW
 #include <w32api.h>
@@ -49,10 +48,6 @@
 #include <ws2tcpip.h>
 #endif
 
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
@@ -63,6 +58,10 @@
 
 /* Include system specific headers */
 
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
@@ -71,9 +70,6 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -103,10 +99,6 @@
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
@@ -198,10 +190,32 @@
 #include <netinet/if_ether.h>
 #endif
 
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
+#ifdef HAVE_LINUX_IF_TUN_H
+#include <linux/if_tun.h>
+#endif
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "getopt.h"
+#endif
+
+#ifdef STATUS
+#undef STATUS
+#endif
+
 #ifdef HAVE_MINGW
 #define SLASH "\\"
 #else
 #define SLASH "/"
 #endif
 
-#endif /* __TINC_SYSTEM_H__ */
+#endif