diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-17 00:14:54 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-17 00:14:54 +0000 |
| commit | 4198293b2568c3fa287e7bde71162e9d442f4305 (patch) | |
| tree | 8cfbc1a406237f68a9a68a544eb0b3129d6312ea /sys/fs/msdosfs/denode.h | |
| parent | 24d58133b7f7836aa02c66016f62b2a8d452ea18 (diff) | |
| parent | f2eb97b2cded8209e6d0d35930507dcfcf5bc794 (diff) | |
Merge ^/head r319801 through r320041.
Notes
Notes:
svn path=/projects/clang500-import/; revision=320042
Diffstat (limited to 'sys/fs/msdosfs/denode.h')
| -rw-r--r-- | sys/fs/msdosfs/denode.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h index 7960f20ddf22..1c7fd5e1db1f 100644 --- a/sys/fs/msdosfs/denode.h +++ b/sys/fs/msdosfs/denode.h @@ -47,6 +47,8 @@ * * October 1992 */ +#ifndef _FS_MSDOSFS_DENODE_H_ +#define _FS_MSDOSFS_DENODE_H_ /* * This is the pc filesystem specific portion of the vnode structure. @@ -207,7 +209,7 @@ struct denode { ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \ putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16)) -#ifdef _KERNEL +#if defined(_KERNEL) || defined(MAKEFS) #define VTODE(vp) ((struct denode *)(vp)->v_data) #define DETOV(de) ((de)->de_vnode) @@ -277,4 +279,6 @@ int deupdat(struct denode *dep, int waitfor); int removede(struct denode *pdep, struct denode *dep); int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred); int doscheckpath( struct denode *source, struct denode *target); -#endif /* _KERNEL */ +#endif /* _KERNEL || MAKEFS */ +#endif /* !_FS_MSDOSFS_DENODE_H_ */ + |