o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Russ Cox 2009-06-16 07:16:25 -07:00
commit 4a34106c7d
4 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/9pfuse/fuse_kernel.h
View file

@ -64,13 +64,13 @@ struct fuse_attr {
__u64 atime;
__u64 mtime;
__u64 ctime;
#if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
#if (__FreeBSD__ >= 10 && OSX_VERSION >= 100500)
__u64 crtime;
#endif /* __FreeBSD__ >= 10 */
__u32 atimensec;
__u32 mtimensec;
__u32 ctimensec;
#if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
#if (__FreeBSD__ >= 10 && OSX_VERSION >= 100500)
__u32 crtimensec;
#endif /* __FreeBSD__ >= 10 */
__u32 mode;
@ -80,7 +80,7 @@ struct fuse_attr {
__u32 rdev;
#if (__FreeBSD__ >= 10)
__u32 flags; /* file flags; see chflags(2) */
#if __OSX_VERSION__ < 100500
#if OSX_VERSION < 100500
__u32 padding;
#endif /* __OSX_VERSION__ < 100500 */
#endif /* __FreeBSD__ >= 10 */