No easy way to properly detect header files...

[tinc] / system.h

diff --git a/system.h b/system.h
index c4dd0d1..d3aa842 100644 (file)
--- a/system.h
+++ b/system.h
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
@@ -35,7 +34,18 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#else
+typedef int bool;
+#define true 1
+#define false 0
+#endif
+
+#ifdef HAVE_TERMIOS_H
 #include <termios.h>
+#endif
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
@@ -72,7 +82,7 @@
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
-#include <sys/ioctl.h>
+#include <sys/param.h>
 #endif
 
 /* SunOS really wants sys/socket.h BEFORE net/if.h,
@@ -110,9 +120,17 @@
 #include <netinet/tcp.h>
 #endif
 
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+#ifdef HAVE_NETINET_IP6_H
+#include <netinet/ip6.h>
+#endif
+
 #ifdef HAVE_MINGW
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 /* Include localisation support */