diff options
author | mlaier <mlaier@FreeBSD.org> | 2004-09-23 12:44:40 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2004-09-23 12:44:40 +0000 |
commit | 83e80bafbae946198508ae4d644be71d1f765b96 (patch) | |
tree | 19501bf38e095177e8ca88f3be7937911e93d7ce /sys/netipsec | |
parent | d240df25edbe48c96491200f17cc79a897c8c955 (diff) | |
download | FreeBSD-src-83e80bafbae946198508ae4d644be71d1f765b96.zip FreeBSD-src-83e80bafbae946198508ae4d644be71d1f765b96.tar.gz |
Protect sockaddr_union definitions with a protecting define. This allows to
build kernels with FAST_IPSEC and PF. This is the least disruptive fix.
PR: kern/71836
Reviewed by: bms, various mailing lists
MFC after: 3 days
Diffstat (limited to 'sys/netipsec')
-rw-r--r-- | sys/netipsec/keydb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h index 1ba8eb1..047f819 100644 --- a/sys/netipsec/keydb.h +++ b/sys/netipsec/keydb.h @@ -37,6 +37,8 @@ #include <netipsec/key_var.h> +#ifndef _SOCKADDR_UNION_DEFINED +#define _SOCKADDR_UNION_DEFINED /* * The union of all possible address formats we handle. */ @@ -45,6 +47,7 @@ union sockaddr_union { struct sockaddr_in sin; struct sockaddr_in6 sin6; }; +#endif /* _SOCKADDR_UNION_DEFINED */ /* Security Assocciation Index */ /* NOTE: Ensure to be same address family */ |