diff options
author | bde <bde@FreeBSD.org> | 2002-04-21 15:47:03 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-04-21 15:47:03 +0000 |
commit | b4c173f82f53329c515ad6a2a1621d6d9e32a264 (patch) | |
tree | 182081341aeb9ea5d3dd2564b7e2a09ab4c4e39f /sys/fs | |
parent | 2deaae67fa55dce5bc5df014d91cf41bfdcf4e92 (diff) | |
download | FreeBSD-src-b4c173f82f53329c515ad6a2a1621d6d9e32a264.zip FreeBSD-src-b4c173f82f53329c515ad6a2a1621d6d9e32a264.tar.gz |
Don't attempt to decvlare M_DEVFS whern MALLOC_DECLARE is not defined.
This fixes warnings that should be errors in fstat.
Reminded by: alpha tinderbox
Fixed some style bugs (ones near BOF and EOF; there are many more).
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/devfs/devfs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h index 598fbf0..137797f 100644 --- a/sys/fs/devfs/devfs.h +++ b/sys/fs/devfs/devfs.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 2000 @@ -35,7 +35,7 @@ */ #ifndef _FS_DEVFS_DEVFS_H_ -#define _FS_DEVFS_DEVFS_H_ +#define _FS_DEVFS_DEVFS_H_ #ifdef _KERNEL /* No userland stuff in here... */ @@ -60,7 +60,9 @@ */ #define DEVFSINOMOUNT 0x2000000 +#ifdef MALLOC_DECLARE MALLOC_DECLARE(M_DEVFS); +#endif struct devfs_dirent { int de_inode; @@ -113,4 +115,5 @@ void devfs_purge (struct devfs_dirent *dd); struct devfs_dirent *devfs_vmkdir (char *name, int namelen, struct devfs_dirent *dotdot); #endif /* _KERNEL */ -#endif /* _FS_DEVFS_DEVFS_H_ */ + +#endif /* !_FS_DEVFS_DEVFS_H_ */ |