summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/inflate.c18
-rw-r--r--sys/kern/md5c.c4
-rw-r--r--sys/kern/subr_blist.c6
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index f38e0bf..c101b7a 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -14,13 +14,13 @@
#include <sys/param.h>
#include <sys/inflate.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/kernel.h>
#endif
#include <sys/malloc.h>
-#ifdef KERNEL
+#ifdef _KERNEL
static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees");
#endif
@@ -30,11 +30,11 @@ static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees");
#define ulg u_long
/* Stuff to make inflate() work */
-#ifdef KERNEL
+#ifdef _KERNEL
#define memzero(dest,len) bzero(dest,len)
#endif
#define NOMEMCPY
-#ifdef KERNEL
+#ifdef _KERNEL
#define FPRINTF printf
#else
extern void putstr (char *);
@@ -49,7 +49,7 @@ extern void putstr (char *);
static const int qflag = 0;
-#ifndef KERNEL /* want to use this file in kzip also */
+#ifndef _KERNEL /* want to use this file in kzip also */
extern unsigned char *kzipmalloc (int);
extern void kzipfree (void*);
#define malloc(x, y, z) kzipmalloc((x))
@@ -447,7 +447,7 @@ huft_build(glbl, b, n, s, d, e, t, m)
/* Generate counts for each bit length */
el = n > 256 ? b[256] : BMAX; /* set length of EOB code, if any */
-#ifdef KERNEL
+#ifdef _KERNEL
memzero((char *) c, sizeof(c));
#else
for (i = 0; i < BMAX+1; i++)
@@ -1045,14 +1045,14 @@ inflate(glbl)
struct inflate *glbl;
{
int i;
-#ifdef KERNEL
+#ifdef _KERNEL
u_char *p = NULL;
if (!glbl->gz_slide)
p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, M_WAITOK);
#endif
if (!glbl->gz_slide)
-#ifdef KERNEL
+#ifdef _KERNEL
return(ENOMEM);
#else
return 3; /* kzip expects 3 */
@@ -1067,7 +1067,7 @@ inflate(glbl)
huft_free(glbl, glbl->gz_fixed_tl);
glbl->gz_fixed_tl = (struct huft *) NULL;
}
-#ifdef KERNEL
+#ifdef _KERNEL
if (p == glbl->gz_slide) {
free(glbl->gz_slide, M_GZIP);
glbl->gz_slide = NULL;
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index c4e3791..700d589 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -30,7 +30,7 @@
#include <sys/types.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#else
#include <string.h>
@@ -39,7 +39,7 @@
#include <sys/md5.h>
-#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/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 5455a7b..cad453f 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -63,7 +63,7 @@
* $FreeBSD$
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,12 +116,12 @@ static void blst_copy(blmeta_t *scan, daddr_t blk, daddr_t radix,
daddr_t skip, blist_t dest, daddr_t count);
static daddr_t blst_radix_init(blmeta_t *scan, daddr_t radix,
int skip, daddr_t count);
-#ifndef KERNEL
+#ifndef _KERNEL
static void blst_radix_print(blmeta_t *scan, daddr_t blk,
daddr_t radix, int skip, int tab);
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
static MALLOC_DEFINE(M_SWAP, "SWAP", "Swap space");
#endif
OpenPOWER on IntegriCloud