Use -D_KERNEL instead of -DKERNEL for greater FreeBSD compliance.

16 files changed, 26 insertions, 26 deletions

diff --git a/cpukit/libnetworking/netinet/icmp_var.h b/cpukit/libnetworking/netinet/icmp_var.h
index e091ca2c61..8e005822ba 100644
--- a/cpukit/libnetworking/netinet/icmp_var.h
+++ b/cpukit/libnetworking/netinet/icmp_var.h
@@ -71,7 +71,7 @@ struct	icmpstat {
 	{ "stats", CTLTYPE_STRUCT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 SYSCTL_DECL(_net_inet_icmp);
 extern struct	icmpstat icmpstat;
 #endif
diff --git a/cpukit/libnetworking/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h
index 41c0bbe220..d27f2e31f7 100644
--- a/cpukit/libnetworking/netinet/if_ether.h
+++ b/cpukit/libnetworking/netinet/if_ether.h
@@ -56,7 +56,7 @@
 #define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 #define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Macro to map an IP multicast address to an Ethernet multicast address.
  * The high-order 25 bits of the Ethernet address are statically assigned,
@@ -127,7 +127,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	etherbroadcastaddr[ETHER_ADDR_LEN];
 extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
 extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
diff --git a/cpukit/libnetworking/netinet/igmp_var.h b/cpukit/libnetworking/netinet/igmp_var.h
index 96230ed638..6f1d0d4700 100644
--- a/cpukit/libnetworking/netinet/igmp_var.h
+++ b/cpukit/libnetworking/netinet/igmp_var.h
@@ -62,7 +62,7 @@ struct igmpstat {
 	u_int	igps_snd_reports;	/* sent membership reports */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern struct igmpstat igmpstat;
 
 #define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/netinet/in.h
index f330e38f0f..7b3b0ca834 100644
--- a/cpukit/libnetworking/netinet/in.h
+++ b/cpukit/libnetworking/netinet/in.h
@@ -252,7 +252,7 @@ struct in_addr {
 
 #define	INADDR_ANY		(u_long)0x00000000
 #define	INADDR_BROADCAST	(u_long)0xffffffff	/* must be masked */
-#ifndef KERNEL
+#ifndef _KERNEL
 #define	INADDR_NONE		0xffffffff		/* -1 return */
 #endif
 
@@ -414,7 +414,7 @@ struct ip_mreq {
 }
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct ifnet; struct mbuf;	/* forward declarations for Standard C */
 
 int	 in_broadcast __P((struct in_addr, struct ifnet *));
@@ -438,6 +438,6 @@ extern	ip_nat_ctl_t *ip_nat_ctl_ptr;
 #define	IP_NAT_IN	0x00000001
 #define	IP_NAT_OUT	0x00000002
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif
diff --git a/cpukit/libnetworking/netinet/in_pcb.h b/cpukit/libnetworking/netinet/in_pcb.h
index df1eeead89..49a9c004bd 100644
--- a/cpukit/libnetworking/netinet/in_pcb.h
+++ b/cpukit/libnetworking/netinet/in_pcb.h
@@ -132,7 +132,7 @@ struct inpcbinfo {
 
 #define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 void	 in_losing __P((struct inpcb *));
 int	 in_pcballoc __P((struct socket *, struct inpcbinfo *));
 int	 in_pcbbind __P((struct inpcb *, struct mbuf *));
diff --git a/cpukit/libnetworking/netinet/in_systm.h b/cpukit/libnetworking/netinet/in_systm.h
index d72e9b4665..6178a7bf5e 100644
--- a/cpukit/libnetworking/netinet/in_systm.h
+++ b/cpukit/libnetworking/netinet/in_systm.h
@@ -55,7 +55,7 @@ typedef u_long	n_long;			/* long as received from the net */
 
 typedef	u_long	n_time;			/* ms since 00:00 GMT, byte rev */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 n_time	 iptime __P((void));
 #endif
 
diff --git a/cpukit/libnetworking/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h
index b64448d2fb..638d07737f 100644
--- a/cpukit/libnetworking/netinet/in_var.h
+++ b/cpukit/libnetworking/netinet/in_var.h
@@ -82,7 +82,7 @@ struct	in_aliasreq {
 	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
 
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 extern	struct	in_ifaddr *in_ifaddr;
 extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
 extern	struct	in_addr zeroin_addr;
@@ -160,7 +160,7 @@ struct in_multi {
 	struct	router_info *inm_rti;	/* router info*/
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef SYSCTL_DECL
 SYSCTL_DECL(_net_inet_ip);
@@ -236,6 +236,6 @@ int	in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
 void	in_rtqdrain __P((void));
 void	ip_input __P((struct mbuf *));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _NETINET_IN_VAR_H_ */
diff --git a/cpukit/libnetworking/netinet/ip_fw.h b/cpukit/libnetworking/netinet/ip_fw.h
index cab7f4ac93..f90deb96c2 100644
--- a/cpukit/libnetworking/netinet/ip_fw.h
+++ b/cpukit/libnetworking/netinet/ip_fw.h
@@ -171,13 +171,13 @@ struct ip_fw_chain {
 /*
  * Main firewall chains definitions and global var's definitions.
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 
 /*
  * Function definitions.
  */
 void ip_fw_init(void);
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _IP_FW_H */
diff --git a/cpukit/libnetworking/netinet/ip_icmp.h b/cpukit/libnetworking/netinet/ip_icmp.h
index 8fd20abb2b..b99ae94521 100644
--- a/cpukit/libnetworking/netinet/ip_icmp.h
+++ b/cpukit/libnetworking/netinet/ip_icmp.h
@@ -182,7 +182,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));
 #endif
diff --git a/cpukit/libnetworking/netinet/ip_mroute.h b/cpukit/libnetworking/netinet/ip_mroute.h
index 5ddd6799d2..35d2437089 100644
--- a/cpukit/libnetworking/netinet/ip_mroute.h
+++ b/cpukit/libnetworking/netinet/ip_mroute.h
@@ -246,7 +246,7 @@ struct tbf
     struct mbuf *tbf_t;		/* tail-insertion pointer	*/
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 extern int	(*ip_mrouter_set) __P((int, struct socket *, struct mbuf *));
 extern int	(*ip_mrouter_get) __P((int, struct socket *, struct mbuf **));
@@ -257,6 +257,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/cpukit/libnetworking/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h
index 38e7896c4a..7d40243f24 100644
--- a/cpukit/libnetworking/netinet/ip_var.h
+++ b/cpukit/libnetworking/netinet/ip_var.h
@@ -150,7 +150,7 @@ struct	ipstat {
 	u_long	ips_toolong;		/* ip length > max ip packet size */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /* flags passed to ip_output as last parameter */
 #define	IP_FORWARDING		0x1		/* most of ip header exists */
 #define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
@@ -207,6 +207,6 @@ extern u_short ip_divert_port;
 extern u_short ip_divert_ignore;
 #endif /* IPDIVERT */
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _NETINET_IP_VAR_H_ */
diff --git a/cpukit/libnetworking/netinet/tcp_debug.h b/cpukit/libnetworking/netinet/tcp_debug.h
index a33743b077..4bff757e2a 100644
--- a/cpukit/libnetworking/netinet/tcp_debug.h
+++ b/cpukit/libnetworking/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/cpukit/libnetworking/netinet/tcp_seq.h b/cpukit/libnetworking/netinet/tcp_seq.h
index 8cccf199e1..ffc64c50af 100644
--- a/cpukit/libnetworking/netinet/tcp_seq.h
+++ b/cpukit/libnetworking/netinet/tcp_seq.h
@@ -78,7 +78,7 @@
 #define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * PR_SLOWHZ)
 					/* 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/cpukit/libnetworking/netinet/tcp_timer.h b/cpukit/libnetworking/netinet/tcp_timer.h
index 38ffac4ee7..98ce0ea1b3 100644
--- a/cpukit/libnetworking/netinet/tcp_timer.h
+++ b/cpukit/libnetworking/netinet/tcp_timer.h
@@ -126,7 +126,7 @@ static char *tcptimers[] =
 		(tv) = (tvmax); \
 }
 
-#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 */
diff --git a/cpukit/libnetworking/netinet/tcp_var.h b/cpukit/libnetworking/netinet/tcp_var.h
index fdd3a17ccd..6c772b5053 100644
--- a/cpukit/libnetworking/netinet/tcp_var.h
+++ b/cpukit/libnetworking/netinet/tcp_var.h
@@ -353,7 +353,7 @@ struct	xtcpcb {
 	{ "keepinit", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #ifdef SYSCTL_DECL
 SYSCTL_DECL(_net_inet_tcp);
 #endif
@@ -400,6 +400,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/cpukit/libnetworking/netinet/udp_var.h b/cpukit/libnetworking/netinet/udp_var.h
index b010e56348..86bfd9d614 100644
--- a/cpukit/libnetworking/netinet/udp_var.h
+++ b/cpukit/libnetworking/netinet/udp_var.h
@@ -89,7 +89,7 @@ struct	udpstat {
 	{ "recvspace", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 SYSCTL_DECL(_net_inet_udp);
 
 extern struct	inpcbhead udb;