diff options
| author | bde <bde@FreeBSD.org> | 2004-02-25 13:03:01 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2004-02-25 13:03:01 +0000 |
| commit | 232b17fc86e465c3d5be2a64f0163863b7c6fe60 (patch) | |
| tree | cd39e0451b52f128b70ad0a02f87b675cdc12285 | |
| parent | 50325f4c96e2dec3a01bc29a36091fe8f1a1dee7 (diff) | |
| download | FreeBSD-src-232b17fc86e465c3d5be2a64f0163863b7c6fe60.zip FreeBSD-src-232b17fc86e465c3d5be2a64f0163863b7c6fe60.tar.gz | |
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)
| -rw-r--r-- | sys/netinet/tcp_var.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 */ |
