d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved declaration of M_IOV to a less bogus place. It belongs in

Browse Source 
<sys/uio.h>, but it doesn't work there because of header pollution
(<sys/uio.h> is prematurely included by <sys/param.h>).
This commit is contained in:
Bruce Evans 1997-12-05 18:58:13 +00:00
parent 8cf27db018
commit a517984c8b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/sys/filedesc.h
View File

@ -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.
*/

9
sys/sys/malloc.h
View File

@ -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,