From 232b17fc86e465c3d5be2a64f0163863b7c6fe60 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Wed, 25 Feb 2004 13:03:01 +0000
Subject: Fixed namespace pollution in rev.1.74.  Implementation of the
 syncache increased <netinet/tcp_var>'s already large set of prerequisites,
 and this was handled badly.  Just don't declare the complete syncache struct
 unless <netinet/pcb.h> is included before <netinet/tcp_var.h>.

Approved by:	jlemon (years ago, for a more invasive fix)
---
 sys/netinet/tcp_var.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 5847636..8fbce8d 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -37,7 +37,6 @@
 #ifndef _NETINET_TCP_VAR_H_
 #define _NETINET_TCP_VAR_H_
 
-#include <netinet/in_pcb.h>		/* needed for in_conninfo, inp_gen_t */
 #include <netinet/tcp.h>
 
 /*
@@ -230,6 +229,7 @@ struct tcpopt {
 	u_int8_t 	to_pad;
 };
 
+#ifdef _NETINET_IN_PCB_H_
 struct syncache {
 	inp_gen_t	sc_inp_gencnt;		/* pointer check */
 	struct 		tcpcb *sc_tp;		/* tcb for listening socket */
@@ -261,6 +261,9 @@ struct syncache_head {
 	TAILQ_HEAD(, syncache)	sch_bucket;
 	u_int		sch_length;
 };
+#else
+struct in_conninfo;
+#endif /* _NETINET_IN_PCB_H_ */
 
 struct hc_metrics_lite {	/* must stay in sync with hc_metrics */
 	u_long	rmx_mtu;	/* MTU for this path */
-- 
cgit v1.1