From 83e80bafbae946198508ae4d644be71d1f765b96 Mon Sep 17 00:00:00 2001
From: mlaier <mlaier@FreeBSD.org>
Date: Thu, 23 Sep 2004 12:44:40 +0000
Subject: 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
---
 sys/netipsec/keydb.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sys/netipsec/keydb.h')

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 */
-- 
cgit v1.1