diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-05-17 12:00:05 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-05-17 12:00:05 +0200 |
| commit | 7da22c96dd646047e97732832331c84528bdc95e (patch) | |
| tree | 182180f14a3e23d52308d40654e1cf06b554944c /src/openvpn/syshead.h | |
| parent | 8a59dafbd02d0ee1faaf674f4420cdc412f13aea (diff) | |
| parent | fcc893c0d8d245525cfb023b6e2a8aae086304cf (diff) | |
Merge tag 'upstream/2.3.1'
Upstream version 2.3.1
Diffstat (limited to 'src/openvpn/syshead.h')
| -rw-r--r-- | src/openvpn/syshead.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index c81f08a..4db29cc 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -307,6 +307,10 @@ #include <netinet/ip.h> #endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif + #ifdef HAVE_NET_IF_TUN_H #include <net/if_tun.h> #endif @@ -395,6 +399,13 @@ #endif /* + * do we have the MIN() macro? + */ +#ifndef MIN +#define MIN(a,b) (((a)<(b))?(a):(b)) +#endif + +/* * Do we have the capability to report extended socket errors? */ #if defined(HAVE_LINUX_TYPES_H) && defined(HAVE_LINUX_ERRQUEUE_H) && defined(HAVE_SOCK_EXTENDED_ERR) && defined(HAVE_MSGHDR) && defined(HAVE_CMSGHDR) && defined(CMSG_FIRSTHDR) && defined(CMSG_NXTHDR) && defined(IP_RECVERR) && defined(MSG_ERRQUEUE) && defined(SOL_IP) && defined(HAVE_IOVEC) |