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.

6 files changed, 13 insertions, 13 deletions

diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index c6ec19e..1086735 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -87,11 +87,11 @@ struct ipxip_req {
 };
 #endif
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 extern struct	ifqueue	ipxintrq;	/* IPX input packet queue */
 extern struct	ipx_ifaddr *ipx_ifaddr;
 
 struct ipx_ifaddr *ipx_iaonnetof __P((struct ipx_addr *dst));
-#endif /* KERNEL */
+#endif
 
 #endif /* !_NETIPX_IPX_IF_H_ */
diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h
index 0543df5..2aeac7b 100644
--- a/sys/netipx/ipx_ip.h
+++ b/sys/netipx/ipx_ip.h
@@ -49,12 +49,12 @@ struct ifnet_en {
 
 #define LOMTU	(1024+512)	/* XXX this is TINY_LOMTU */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 void	ipxip_ctlinput __P((int cmd, struct sockaddr *sa, void *arg));
 void	ipxip_input __P((struct mbuf *m, int hlen));
 int	ipxip_route __P((struct socket *so, struct sockopt *sopt));
 
-#endif /* KERNEL */
+#endif
 
 #endif /* !_NETIPX_IPXIP_H_ */
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index 366f6c1..13bd9f9 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -79,7 +79,7 @@ struct ipxpcb {
 #define	IPXSNDQ		16384
 #define	IPXRCVQ		40960
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern struct ipxpcb ipxpcb;			/* head of list */
 
 int	ipx_pcballoc __P((struct socket *so, struct ipxpcb *head,
@@ -96,6 +96,6 @@ void	ipx_pcbnotify __P((struct ipx_addr *dst, int errno,
 			   void (*notify)(struct ipxpcb *), long param));
 void	ipx_setpeeraddr __P((struct ipxpcb *ipxp, struct sockaddr **nam));
 void	ipx_setsockaddr __P((struct ipxpcb *ipxp, struct sockaddr **nam));
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETIPX_IPX_PCB_H_ */
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index acdafe5..c387738 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -56,7 +56,7 @@ struct	ipxstat {
 	u_long	ipxs_mtutoosmall;	/* the interface mtu is too small */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef SYSCTL_DECL
 SYSCTL_DECL(_net_ipx);
@@ -103,6 +103,6 @@ void	ipx_printhost __P((struct ipx_addr *addr));
 int	ipx_sockaddr __P((struct socket *so, struct sockaddr **nam));
 void	ipx_watch_output __P((struct mbuf *m, struct ifnet *ifp));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETIPX_IPX_VAR_H_ */
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 6fca28a..0cf9829 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -167,7 +167,7 @@ struct spxpcb {
 #define	ipxtospxpcb(np)	((struct spxpcb *)(np)->ipxp_pcb)
 #define	sotospxpcb(so)	(ipxtospxpcb(sotoipxpcb(so)))
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 extern struct pr_usrreqs spx_usrreqs;
 extern struct pr_usrreqs spx_usrreq_sps;
@@ -179,6 +179,6 @@ void	spx_init __P((void));
 void	spx_input __P((struct mbuf *m, struct ipxpcb *ipxp));
 void	spx_slowtimo __P((void));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_NETIPX_SPX_H_ */
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 94f2e2f..e602bb9d 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -61,19 +61,19 @@ char	*spxnames[] =
 #endif
 
 #define	SPX_NDEBUG 100
-#ifndef KERNEL
+#ifndef _KERNEL
 /* XXX common variables for broken applications. */
 struct	spx_debug spx_debug[SPX_NDEBUG];
 int	spx_debx;
 #endif
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern char *prurequests[];
 extern char *sanames[];
 extern char *tcpstates[];
 
 void	spx_trace __P((int act, int ostate, struct spxpcb *sp, struct spx *si,
 		       int req));
-#endif /* KERNEL */
+#endif
 
 #endif /* !_NETIPX_SPX_DEBUG_H_ */