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, 25 insertions, 20 deletions

diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index b27b386..caf0c14 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(KERNEL) && defined(LIBC_SCCS)
+#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
 #if 0
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
@@ -41,7 +41,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/gmon.h>
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/systm.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -78,7 +78,7 @@ _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 	register struct tostruct *top, *prevtop;
 	register struct gmonparam *p;
 	register long toindex;
-#ifdef KERNEL
+#ifdef _KERNEL
 	MCOUNT_DECL(s)
 #endif
 
@@ -91,14 +91,14 @@ _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 	if (p->state != GMON_PROF_ON)
 		return;
 #endif
-#ifdef KERNEL
+#ifdef _KERNEL
 	MCOUNT_ENTER(s);
 #else
 	p->state = GMON_PROF_BUSY;
 #endif
 	frompci = frompc - p->lowpc;
 
-#ifdef KERNEL
+#ifdef _KERNEL
 	/*
 	 * When we are called from an exception handler, frompci may be
 	 * for a user address.  Convert such frompci's to the index of
@@ -112,7 +112,7 @@ _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 		if (frompci >= p->textsize)
 		    goto done;
 	}
-#endif /* KERNEL */
+#endif
 
 #ifdef GUPROF
 	if (p->state != GMON_PROF_HIRES)
@@ -161,7 +161,7 @@ _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 skip_guprof_stuff:
 #endif /* GUPROF */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 	/*
 	 * When we are called from an exception handler, frompc is faked
 	 * to be for where the exception occurred.  We've just solidified
@@ -177,7 +177,7 @@ skip_guprof_stuff:
 		else
 			frompci = (uintfptr_t)btrap - p->lowpc;
 	}
-#endif /* KERNEL */
+#endif
 
 	/*
 	 * check that frompc is a reasonable pc value.
@@ -259,7 +259,7 @@ skip_guprof_stuff:
 
 	}
 done:
-#ifdef KERNEL
+#ifdef _KERNEL
 	MCOUNT_EXIT(s);
 #else
 	p->state = GMON_PROF_ON;
@@ -267,7 +267,7 @@ done:
 	return;
 overflow:
 	p->state = GMON_PROF_ERROR;
-#ifdef KERNEL
+#ifdef _KERNEL
 	MCOUNT_EXIT(s);
 #endif
 	return;
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index f2a0918..dced8f2 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -123,14 +123,14 @@ authunix_create(machname, uid, gid, len, aup_gids)
 	 * Allocate and set up auth handle
 	 */
 	auth = (AUTH *)mem_alloc(sizeof(*auth));
-#ifndef KERNEL
+#ifndef _KERNEL
 	if (auth == NULL) {
 		(void)fprintf(stderr, "authunix_create: out of memory\n");
 		return (NULL);
 	}
 #endif
 	au = (struct audata *)mem_alloc(sizeof(*au));
-#ifndef KERNEL
+#ifndef _KERNEL
 	if (au == NULL) {
 		(void)fprintf(stderr, "authunix_create: out of memory\n");
 		return (NULL);
@@ -166,7 +166,7 @@ authunix_create(machname, uid, gid, len, aup_gids)
 		abort();
 	au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs);
 	au->au_origcred.oa_flavor = AUTH_UNIX;
-#ifdef KERNEL
+#ifdef _KERNEL
 	au->au_origcred.oa_base = mem_alloc((u_int) len);
 #else
 	if ((au->au_origcred.oa_base = mem_alloc((u_int) len)) == NULL) {
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 0063e75..fa1dca7 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -33,7 +33,12 @@
 #ident	"@(#)svc_auth.c	1.16	94/04/24 SMI"
 
 #if !defined(lint) && defined(SCCSIDS)
+#if 0
 static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif
 
 /*
@@ -41,7 +46,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
  *
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index a80ba8e..de0bcb2 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -50,9 +50,9 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/user.h>
 #include <sys/proc.h>
-#define KERNEL
+#define _KERNEL
 #include <sys/file.h>
-#undef KERNEL
+#undef _KERNEL
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <nlist.h>
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 8e25a6a..6828b9b 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/systm.h>
 #else
 #include <string.h>
@@ -40,7 +40,7 @@
 
 static void MD5Transform __P((u_int32_t [4], const unsigned char [64]));
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #define memset(x,y,z)	bzero(x,z);
 #define memcpy(x,y,z)	bcopy(y, x, z)
 #endif
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 7115603..ba54885 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -74,9 +74,9 @@
 #endif
 
 /* Avoid unwanted userlandish components */
-#define KERNEL
+#define _KERNEL
 #include <sys/errno.h>
-#undef KERNEL
+#undef _KERNEL
 
 /* special stand error codes */
 #define	EADAPT	(ELAST+1)	/* bad adaptor */