There is no TCP6 in our kernel, so remove the #ifndef TCP6.

No binary change.
ok claudio@ henning@

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index dcca8ad53a9..6ded3dd733f 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.96 2010/09/24 02:59:46 claudio Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.97 2010/10/21 11:38:27 bluhm Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -560,7 +560,7 @@ struct tcpcb *
 	 tcp_close(struct tcpcb *);
 void	 tcp_reaper(void *);
 int	 tcp_freeq(struct tcpcb *);
-#if defined(INET6) && !defined(TCP6)
+#ifdef INET6
 void	 tcp6_ctlinput(int, struct sockaddr *, void *);
 #endif
 void	 *tcp_ctlinput(int, struct sockaddr *, u_int, void *);
@@ -572,7 +572,7 @@ struct tcpcb *
 int	 tcp_dooptions(struct tcpcb *, u_char *, int, struct tcphdr *,
 		struct mbuf *, int, struct tcp_opt_info *, u_int);
 void	 tcp_init(void);
-#if defined(INET6) && !defined(TCP6)
+#ifdef INET6
 int	 tcp6_input(struct mbuf **, int *, int);
 #endif
 void	 tcp_input(struct mbuf *, ...);
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 68f18b0e70d..e6f88d8a826 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_var.h,v 1.20 2009/11/13 20:54:05 claudio Exp $	*/
+/*	$OpenBSD: udp_var.h,v 1.21 2010/10/21 11:38:27 bluhm Exp $	*/
 /*	$NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $	*/
 
 /*
@@ -102,10 +102,10 @@ struct	udpstat {
 extern struct	inpcbtable udbtable;
 extern struct	udpstat udpstat;
 
-#if defined(INET6) && !defined(TCP6)
+#ifdef INET6
 void	udp6_ctlinput(int, struct sockaddr *, void *);
 int	udp6_input(struct mbuf **, int *, int);
-#endif /* INET6 && !TCP6 */
+#endif /* INET6 */
 void	 *udp_ctlinput(int, struct sockaddr *, u_int, void *);
 void	 udp_init(void);
 void	 udp_input(struct mbuf *, ...);