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.

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 923293c..850e5e7 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -135,7 +135,7 @@ struct ncp_conn_stat {
 	char		user[NCP_MAXUSERNAMELEN+1];
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifndef LK_SHARED
 #include <sys/lock.h>
@@ -234,5 +234,5 @@ extern int ncp_burst_enabled;
 MALLOC_DECLARE(M_NCPDATA);
 #endif
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 #endif /* _NCP_CONN_H_ */
diff --git a/sys/netncp/ncp_crypt.c b/sys/netncp/ncp_crypt.c
index 8ffb62b..a17d4fe 100644
--- a/sys/netncp/ncp_crypt.c
+++ b/sys/netncp/ncp_crypt.c
@@ -134,7 +134,7 @@ nw_encrypt(const u_char *fra, const u_char *buf, u_char *target) {
 		*target++ = k[s] ^ k[15 - s];
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * MD4 routine taken from libmd sources
  */
@@ -271,4 +271,4 @@ unsigned int len;
       (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
 }
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/netncp/ncp_nls.h b/sys/netncp/ncp_nls.h
index 489b6df..bedc7ca 100644
--- a/sys/netncp/ncp_nls.h
+++ b/sys/netncp/ncp_nls.h
@@ -50,7 +50,7 @@ struct ncp_nlstables {
 	int	opt;		/* may depend on context */
 };
 
-#ifndef KERNEL
+#ifndef _KERNEL
 /*
  * NLS, supported character conversion schemes.
  * NCP_NLS_UNIXCHARSET_NETWARECHARSET
@@ -74,7 +74,7 @@ char* ncp_nls_mem_u2n(char *dst, const char *src, int size);
 
 __END_DECLS
 
-#else /* !KERNEL */
+#else /* !_KERNEL */
 
 
 extern struct ncp_nlstables ncp_defnls;
@@ -85,6 +85,6 @@ void ncp_pathcopy(char *src, char *dst, int len, struct ncp_nlstables *nt);
 int  ncp_pathcheck(char *s, int len, struct ncp_nlstables *nt, int strict);
 void ncp_path2unix(char *src, char *dst, int len, struct ncp_nlstables *nt);
 
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
 
 #endif /* _NCP_NCP_NLS_H_ */
diff --git a/sys/netncp/ncp_rq.h b/sys/netncp/ncp_rq.h
index 7cc58fe..b6cf706 100644
--- a/sys/netncp/ncp_rq.h
+++ b/sys/netncp/ncp_rq.h
@@ -81,7 +81,7 @@
 #endif
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct ncp_nlstables;
 /* 
  * Structure to prepare ncp request and receive reply 
@@ -154,7 +154,7 @@ static int __inline ncp_rq_usermem(struct ncp_rq *rqp, caddr_t source, int size)
 }
 void ncp_sign_init(const char *logindata, char *sign_root);
 
-#else /* ifdef KERNEL */
+#else /* ifdef _KERNEL */
 
 #define	DECLARE_RQ	struct ncp_buf conn1, *conn=&conn1
 
@@ -189,6 +189,6 @@ ConvertToNWfromDWORD(u_int32_t sfd, ncp_fh *fh) {
 
 __END_DECLS
 
-#endif /* ifdef KERNEL */
+#endif /* ifdef _KERNEL */
 
 #endif	/* !_NETNCP_NCP_RQ_H_ */