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-04-30 08:01:33 -07:00
commit d439750308
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,6 @@
/* /*
This file defines the kernel interface of FUSE This file defines the kernel interface of FUSE
Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu> Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
@ -61,13 +64,13 @@ struct fuse_attr {
__u64 atime; __u64 atime;
__u64 mtime; __u64 mtime;
__u64 ctime; __u64 ctime;
#if (__FreeBSD__ >= 10) #if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
__u64 crtime; __u64 crtime;
#endif /* __FreeBSD__ >= 10 */ #endif /* __FreeBSD__ >= 10 */
__u32 atimensec; __u32 atimensec;
__u32 mtimensec; __u32 mtimensec;
__u32 ctimensec; __u32 ctimensec;
#if (__FreeBSD__ >= 10) #if (__FreeBSD__ >= 10 && __OSX_VERSION__ >= 100500)
__u32 crtimensec; __u32 crtimensec;
#endif /* __FreeBSD__ >= 10 */ #endif /* __FreeBSD__ >= 10 */
__u32 mode; __u32 mode;
@ -77,6 +80,9 @@ struct fuse_attr {
__u32 rdev; __u32 rdev;
#if (__FreeBSD__ >= 10) #if (__FreeBSD__ >= 10)
__u32 flags; /* file flags; see chflags(2) */ __u32 flags; /* file flags; see chflags(2) */
#if __OSX_VERSION__ < 100500
__u32 padding;
#endif /* __OSX_VERSION__ < 100500 */
#endif /* __FreeBSD__ >= 10 */ #endif /* __FreeBSD__ >= 10 */
}; };

1
src/cmd/9pfuse/mkfile
View file

@ -1,4 +1,5 @@
<$PLAN9/src/mkhdr <$PLAN9/src/mkhdr
<|osxvers
TARG=9pfuse TARG=9pfuse

7
src/cmd/9pfuse/osxvers Executable file
View 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