merge
This commit is contained in:
commit
d439750308
3 changed files with 16 additions and 2 deletions
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
|
||||
|
||||
/*
|
||||
This file defines the kernel interface of FUSE
|
||||
Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
|
||||
|
|
@ -61,13 +64,13 @@ struct fuse_attr {
|
|||
__u64 atime;
|
||||
__u64 mtime;
|
||||
__u64 ctime;
|
||||
#if (__FreeBSD__ >= 10)
|
||||
#if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
|
||||
__u64 crtime;
|
||||
#endif /* __FreeBSD__ >= 10 */
|
||||
__u32 atimensec;
|
||||
__u32 mtimensec;
|
||||
__u32 ctimensec;
|
||||
#if (__FreeBSD__ >= 10)
|
||||
#if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
|
||||
__u32 crtimensec;
|
||||
#endif /* __FreeBSD__ >= 10 */
|
||||
__u32 mode;
|
||||
|
|
@ -77,6 +80,9 @@ struct fuse_attr {
|
|||
__u32 rdev;
|
||||
#if (__FreeBSD__ >= 10)
|
||||
__u32 flags; /* file flags; see chflags(2) */
|
||||
#if __OSX_VERSION__ < 100500
|
||||
__u32 padding;
|
||||
#endif /* __OSX_VERSION__ < 100500 */
|
||||
#endif /* __FreeBSD__ >= 10 */
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<$PLAN9/src/mkhdr
|
||||
<|osxvers
|
||||
|
||||
TARG=9pfuse
|
||||
|
||||
|
|
|
|||
7
src/cmd/9pfuse/osxvers
Executable file
7
src/cmd/9pfuse/osxvers
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
u=`uname`
|
||||
case "$u" in
|
||||
Darwin)
|
||||
sw_vers | awk '$1 == "ProductVersion:" {print $2}' | awk -F. '{printf("CFLAGS=$CFLAGS -DOSX_VERSION=%d%02d%02d\n", $1, $2, $3)}'
|
||||
esac
|
||||
Loading…
Add table
Add a link
Reference in a new issue