Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"

is an application space macro and the applications are supposed to be free
to use it as they please (but cannot).  This is consistant with the other
BSD's who made this change quite some time ago.  More commits to come.

20 files changed, 34 insertions, 34 deletions

diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 02d147c..62f09b1 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_ICMP_VAR_H_
 #define _NETINET_ICMP_VAR_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include "opt_icmp_bandlim.h"		/* for ICMP_BANDLIM     */
 #endif
 
@@ -77,7 +77,7 @@ struct	icmpstat {
 	{ "icmplim", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 SYSCTL_DECL(_net_inet_icmp);
 #ifdef ICMP_BANDLIM
 extern int badport_bandlim __P((int));
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 09caa31..2d590ad 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -109,7 +109,7 @@ struct sockaddr_inarp {
 #define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
 #define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
 extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
 extern struct	ifqueue arpintrq;
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index fc6acc6..9f83882 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -69,7 +69,7 @@ struct	fddi_header {
 #define FDDIFC_LLC_SYNC         0xd0
 #define	FDDIFC_SMT		0x40
 
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
 #define	fddibroadcastaddr	etherbroadcastaddr
 #define	fddi_ipmulticast_min	ether_ipmulticast_min
 #define	fddi_ipmulticast_max	ether_ipmulticast_max
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index d22cd51..5688f24 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -62,7 +62,7 @@ struct igmpstat {
 	u_int	igps_snd_reports;	/* sent membership reports */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
 
 /*
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 15a182c..b18be00 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -267,7 +267,7 @@ struct in_addr {
 #define	INADDR_ANY		(u_int32_t)0x00000000
 #define	INADDR_LOOPBACK		(u_int32_t)0x7f000001
 #define	INADDR_BROADCAST	(u_int32_t)0xffffffff	/* must be masked */
-#ifndef KERNEL
+#ifndef _KERNEL
 #define	INADDR_NONE		0xffffffff		/* -1 return */
 #endif
 
@@ -444,7 +444,7 @@ struct ip_mreq {
 /* INET6 stuff */
 #include <netinet6/in6.h>
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct ifnet; struct mbuf;	/* forward declarations for Standard C */
 struct proc;
 
@@ -457,6 +457,6 @@ char 	*inet_ntoa __P((struct in_addr)); /* in libkern */
 int	prison_ip __P((struct proc *p, int flag, u_int32_t *ip));
 void	prison_remote_ip __P((struct proc *p, int flag, u_int32_t *ip));
 
-#endif /* KERNEL */
+#endif
 
 #endif
diff --git a/sys/netinet/in_hostcache.h b/sys/netinet/in_hostcache.h
index 98e8fd4..710756a 100644
--- a/sys/netinet/in_hostcache.h
+++ b/sys/netinet/in_hostcache.h
@@ -67,7 +67,7 @@ struct in_hcentry {
 #define	INHC_MULTICAST	0x0004	/* this address is multicast */
 #define	INHC_REDUCEDMTU	0x0008	/* we reduced the mtu via PMTU discovery */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * inhc_alloc can block while adding a new entry to the cache;
  * inhc_lookup will does not add new entries and so can be called
@@ -78,6 +78,6 @@ int	inhc_init(void);
 struct	in_hcentry *inhc_lookup(struct sockaddr_in *sin);
 #define	inhc_ref(inhc)	(hc_ref(&(inhc)->inhc_hc))
 #define	inhc_rele(inhc)	(hc_rele(&(inhc)->inhc_hc))
-#endif /* KERNEL */
+#endif
 
 #endif /* _NETINET_IN_HOSTCACHE_H */
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 5aeb579..08733ad 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -265,7 +265,7 @@ struct inpcbinfo {		/* XXX documentation, prefixes */
 
 #define	INP_CHECK_SOCKAF(so, af) 	(INP_SOCKAF(so) == af)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern int	ipport_lowfirstauto;
 extern int	ipport_lowlastauto;
 extern int	ipport_firstauto;
@@ -296,6 +296,6 @@ int	in_setpeeraddr __P((struct socket *so, struct sockaddr **nam));
 int	in_setsockaddr __P((struct socket *so, struct sockaddr **nam));
 void	in_pcbremlists __P((struct inpcb *inp));
 int	prison_xinpcb __P((struct proc *p, struct inpcb *inp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETINET_IN_PCB_H_ */
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 5d18c56..13fa81d 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -55,7 +55,7 @@ typedef u_int32_t n_long;		/* long as received from the net */
 
 typedef	u_int32_t n_time;		/* ms since 00:00 GMT, byte rev */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 n_time	 iptime __P((void));
 #endif
 
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index c04c778..de2a6a6 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -80,7 +80,7 @@ struct	in_aliasreq {
 	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
 
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 extern	TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;
 extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
 extern	struct	in_addr zeroin_addr;
@@ -156,7 +156,7 @@ struct in_multi {
 	struct	router_info *inm_rti;	/* router info*/
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef SYSCTL_DECL
 SYSCTL_DECL(_net_inet_ip);
@@ -230,7 +230,7 @@ int	ipflow_fastforward __P((struct mbuf *));
 void	ipflow_create __P((const struct route *, struct mbuf *));
 void	ipflow_slowtimo __P((void));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 /* INET6 stuff */
 #include <netinet6/in6_var.h>
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 2c0e8b9..61ca6dd 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -99,7 +99,7 @@ struct dn_pipe {			/* a pipe */
 #define DN_TO_IP_IN	2
 #define DN_TO_BDG_FWD	3
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 MALLOC_DECLARE(M_IPFW);
 
@@ -111,6 +111,6 @@ int dummynet_io(int pipe, int dir,
 	struct mbuf *m, struct ifnet *ifp, struct route *ro,
 	struct sockaddr_in * dst,
 	struct ip_fw_chain *rule, int flags);
-#endif /* KERNEL */
+#endif
 
 #endif /* _IP_DUMMYNET_H */
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index 4a0bfd5..921ce37 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -38,7 +38,7 @@
 #define	ECN_FORBIDDEN	0	/* ECN forbidden */
 #define	ECN_NOCARE	(-1)	/* no consideration to ECN */
 
-#if defined(KERNEL) || defined(_KERNEL)
+#ifdef _KERNEL
 extern void ip_ecn_ingress __P((int, u_int8_t *, u_int8_t *));
 extern void ip_ecn_egress __P((int, u_int8_t *, u_int8_t *));
 #endif
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index eb4a999..11c56a4 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -210,7 +210,7 @@ struct ip_fw_chain {
 /*
  * Main firewall chains definitions and global var's definitions.
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #define IP_FW_PORT_DYNT_FLAG	0x10000
 #define IP_FW_PORT_TEE_FLAG	0x20000
@@ -229,6 +229,6 @@ typedef	int ip_fw_ctl_t __P((struct sockopt *));
 extern	ip_fw_chk_t *ip_fw_chk_ptr;
 extern	ip_fw_ctl_t *ip_fw_ctl_ptr;
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _IP_FW_H */
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 201c3fc..b7d5400 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -184,7 +184,7 @@ struct icmp {
 	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
 	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 void	icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *));
 void	icmp_input __P((struct mbuf *, int, int));
 #endif
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index abcceda..8c990c8 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -249,7 +249,7 @@ struct tbf
     struct mbuf *tbf_t;		/* tail-insertion pointer	*/
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 struct sockopt;
 
@@ -262,6 +262,6 @@ extern int	(*mrt_ioctl) __P((int, caddr_t));
 extern int	(*mrt_ioctl) __P((int, caddr_t, struct proc *));
 #endif
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 2c438d6..ac7f79c 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -124,7 +124,7 @@ struct	ipstat {
 	u_long	ips_nogif;		/* no match gif found */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 /* flags passed to ip_output as last parameter */
 #define	IP_FORWARDING		0x1		/* most of ip header exists */
@@ -189,6 +189,6 @@ extern u_int16_t ip_divert_cookie;
 
 extern struct sockaddr_in *ip_fw_fwd_addr;
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETINET_IP_VAR_H_ */
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index c359cb4..dcca378 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -60,7 +60,7 @@ static char	*tanames[] =
 
 #define	TCP_NDEBUG 100
 
-#ifndef KERNEL
+#ifndef _KERNEL
 /* XXX common variables for broken applications. */
 struct	tcp_debug tcp_debug[TCP_NDEBUG];
 int	tcp_debx;
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index de50dd5..aeefb20 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -78,7 +78,7 @@
 #define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * hz)
 					/* timestamp wrap-around time */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern tcp_cc	tcp_ccgen;		/* global connection count */
 
 /*
@@ -98,5 +98,5 @@ extern tcp_cc	tcp_ccgen;		/* global connection count */
 extern tcp_seq	tcp_iss;		/* tcp initial send seq # */
 #else
 #define	TCP_ISSINCR	(250*1024)	/* increment for tcp_iss each second */
-#endif /* KERNEL */
+#endif /* _KERNEL */
 #endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 1f8d1b7..b2bcb43 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -117,7 +117,7 @@ static char *tcptimers[] =
 		(tv) = (tvmax); \
 } while(0)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern int tcp_keepinit;		/* time to establish connection */
 extern int tcp_keepidle;		/* time before keepalive probes begin */
 extern int tcp_keepintvl;		/* time between keepalive probes */
@@ -134,6 +134,6 @@ void	tcp_timer_persist __P((void *xtp));
 void	tcp_timer_rexmt __P((void *xtp));
 void	tcp_timer_delack __P((void *xtp));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETINET_TCP_TIMER_H_ */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 9c24732..2b1b2e5 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -336,7 +336,7 @@ struct	xtcpcb {
 }
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #ifdef SYSCTL_DECL
 SYSCTL_DECL(_net_inet_tcp);
 #endif
@@ -385,6 +385,6 @@ extern	struct pr_usrreqs tcp_usrreqs;
 extern	u_long tcp_sendspace;
 extern	u_long tcp_recvspace;
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _NETINET_TCP_VAR_H_ */
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 491632e..db28920 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -102,7 +102,7 @@ struct	udpstat {
 	{ "pcblist", CTLTYPE_STRUCT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 SYSCTL_DECL(_net_inet_udp);
 
 extern struct	pr_usrreqs udp_usrreqs;