diff options
| author | bde <bde@FreeBSD.org> | 1997-12-05 18:58:13 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-12-05 18:58:13 +0000 |
| commit | 8ee98ba6eecb5aaaba384e00fe11ee588e3299a4 (patch) | |
| tree | 3cc81b96a228c82c9962028c31794af547834561 | |
| parent | b3ecbbca513a3cc07d9c496b54bd0374555bd294 (diff) | |
| download | FreeBSD-src-8ee98ba6eecb5aaaba384e00fe11ee588e3299a4.zip FreeBSD-src-8ee98ba6eecb5aaaba384e00fe11ee588e3299a4.tar.gz | |
Moved declaration of M_IOV to a less bogus place. It belongs in
<sys/uio.h>, but it doesn't work there because of header pollution
(<sys/uio.h> is prematurely included by <sys/param.h>).
| -rw-r--r-- | sys/sys/filedesc.h | 5 | ||||
| -rw-r--r-- | sys/sys/malloc.h | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index cc97195..444c3ef 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 - * $Id: filedesc.h,v 1.11 1997/02/22 09:45:14 peter Exp $ + * $Id: filedesc.h,v 1.12 1997/10/12 20:25:57 phk Exp $ */ #ifndef _SYS_FILEDESC_H_ @@ -92,9 +92,6 @@ struct filedesc0 { #define OFILESIZE (sizeof(struct file *) + sizeof(char)) #ifdef KERNEL -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_IOV); -#endif /* * Kernel global variables and routines. */ diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 2c1d493..12027bb 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $Id: malloc.h,v 1.32 1997/12/04 07:29:17 davidg Exp $ + * $Id: malloc.h,v 1.33 1997/12/05 05:36:49 dyson Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -199,6 +199,13 @@ extern char *kmembase; extern struct kmembuckets bucket[]; #endif /* do not collect statistics */ +/* + * XXX this should be declared in <sys/uio.h>, but that tends to fail + * because <sys/uio.h> is included in a header before the source file + * has a chance to include <sys/malloc.h> to get MALLOC_DECLARE() defined. + */ +MALLOC_DECLARE(M_IOV); + void *contigmalloc __P((unsigned long size, struct malloc_type *type, int flags, unsigned long low, unsigned long high, |
