diff options
| author | peter <peter@FreeBSD.org> | 1998-11-10 09:08:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-11-10 09:08:49 +0000 |
| commit | 2dc70fe9f6998c540b9d03f18a04649e88760ad3 (patch) | |
| tree | 4e3919954c17dbf349f26e38951aadf3be22c8b1 /sys/kern/inflate.c | |
| parent | e2cbb31311dcb5aad532570f7dffd777a8408ff1 (diff) | |
| download | FreeBSD-src-2dc70fe9f6998c540b9d03f18a04649e88760ad3.zip FreeBSD-src-2dc70fe9f6998c540b9d03f18a04649e88760ad3.tar.gz | |
kzipboot uses kern/inflate.c outside the kernel by providing its own
minimal malloc/free implementation. Stop passing M_GZIP to it.
Diffstat (limited to 'sys/kern/inflate.c')
| -rw-r--r-- | sys/kern/inflate.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index 4558eb3..1db9b2c 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -7,7 +7,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: inflate.c,v 1.10 1997/10/11 18:31:20 phk Exp $ + * $Id: inflate.c,v 1.11 1997/10/12 20:23:40 phk Exp $ * * */ @@ -16,10 +16,13 @@ #include <sys/inflate.h> #ifdef KERNEL #include <sys/systm.h> +#include <sys/kernel.h> #endif #include <sys/malloc.h> +#ifdef KERNEL static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees"); +#endif /* needed to make inflate() work */ #define uch u_char @@ -47,8 +50,10 @@ extern void putstr (char *); static const int qflag = 0; #ifndef KERNEL /* want to use this file in kzip also */ -extern unsigned char *malloc (int, int, int); -extern void free (void*, int); +extern unsigned char *kzipmalloc (int); +extern void kzipfree (void*); +#define malloc(x, y, z) kzipmalloc((x)) +#define free(x, y) kzipfree((x)) #endif /* |
