summaryrefslogtreecommitdiffstats
path: root/sys/kern/inflate.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
committerpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
commitd53e4c1d809338e9b317d95bdded2f7f7a986556 (patch)
tree916004bdaa3cf47d2a92effe8c981e7d1ff5ccec /sys/kern/inflate.c
parent15b9bcb121e1f3735a2c98a11afdb52a03301d7e (diff)
downloadFreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.zip
FreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.tar.gz
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.
Diffstat (limited to 'sys/kern/inflate.c')
-rw-r--r--sys/kern/inflate.c18
1 files changed, 9 insertions, 9 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;
OpenPOWER on IntegriCloud