projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow compiling for Windows XP and higher.
[tinc]
/
have.h
diff --git
a/have.h
b/have.h
index
e5b0af8
..
7e2930d
100644
(file)
--- a/
have.h
+++ b/
have.h
@@
-1,7
+1,7
@@
/*
have.h -- include headers which are known to exist
/*
have.h -- include headers which are known to exist
- Copyright (C) 1998-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
- 2003-200
4
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
+ 2003-200
6
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
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
@@
-31,6
+31,17
@@
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
+#ifdef HAVE_MINGW
+#ifdef WITH_WINDOWS2000
+#define WINVER Windows2000
+#else
+#define WINVER WindowsXP
+#endif
+#include <w32api.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#endif
+
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#endif
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#endif
@@
-43,6
+54,10
@@
#include <inttypes.h>
#endif
#include <inttypes.h>
#endif
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
/* Include system specific headers */
#ifdef HAVE_SYSLOG_H
/* Include system specific headers */
#ifdef HAVE_SYSLOG_H
@@
-77,6
+92,10
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
/* SunOS really wants sys/socket.h BEFORE net/if.h,
and FreeBSD wants these lines below the rest. */
/* SunOS really wants sys/socket.h BEFORE net/if.h,
and FreeBSD wants these lines below the rest. */
@@
-92,6
+111,18
@@
#include <net/if.h>
#endif
#include <net/if.h>
#endif
+#ifdef HAVE_NET_IF_TYPES_H
+#include <net/if_types.h>
+#endif
+
+#ifdef HAVE_NET_IF_TUN_H
+#include <net/if_tun.h>
+#endif
+
+#ifdef HAVE_NET_IF_TAP_H
+#include <net/if_tap.h>
+#endif
+
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
@@
-140,9
+171,4
@@
#include <netinet/if_ether.h>
#endif
#include <netinet/if_ether.h>
#endif
-#ifdef HAVE_MINGW
-#include <windows.h>
-#include <winsock2.h>
-#endif
-
#endif /* __TINC_SYSTEM_H__ */
#endif /* __TINC_SYSTEM_H__ */