X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=system.h;h=b0d23c8cbc65f914be63a8891269fb7bf724a6aa;hp=c4dd0d14cdfe2a049fa63b395153ea523f23dab7;hb=9e44f116bf0f72d1dd4f099440a351dbe0a74573;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/system.h b/system.h
index c4dd0d14..b0d23c8c 100644
--- a/system.h
+++ b/system.h
@@ -1,7 +1,7 @@
 /*
     system.h -- system headers
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
-                       2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2003-2004 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
@@ -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,
@@ -82,10 +92,6 @@
 #include <netdb.h>
 #endif
 
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -102,6 +108,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
 #endif
@@ -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 */