From 3926813b125c278825702da2895f0d0c3d52f5e1 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 15 Jun 2016 00:56:53 +0200 Subject: [PATCH] Add experimental support for macOS 10.12 SDK --- osxfuse/fuse_nodehash.c | 10 ++++++---- osxfuse/fuse_vfsops.c | 14 +++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/osxfuse/fuse_nodehash.c b/osxfuse/fuse_nodehash.c index 9ec26f2..915cd3b 100644 --- a/osxfuse/fuse_nodehash.c +++ b/osxfuse/fuse_nodehash.c @@ -30,10 +30,12 @@ # include "fuse_locking.h" #endif -#if M_OSXFUSE_ENABLE_UNSUPPORTED -# define LCK_MTX_ASSERT lck_mtx_assert -#else -# define LCK_MTX_ASSERT(gHashMutex, LCK_MTX_ASSERT_OWNED) do { } while (0) +#if VERSION_MAJOR < 16 +# if M_OSXFUSE_ENABLE_UNSUPPORTED +# define LCK_MTX_ASSERT_DONOTUSE lck_mtx_assert +# else +# define LCK_MTX_ASSERT(gHashMutex, LCK_MTX_ASSERT_OWNED) do { } while (0) +# endif #endif /* diff --git a/osxfuse/fuse_vfsops.c b/osxfuse/fuse_vfsops.c index ae70e4c..61026f3 100644 --- a/osxfuse/fuse_vfsops.c +++ b/osxfuse/fuse_vfsops.c @@ -121,7 +121,19 @@ static struct vfsops fuse_vfs_ops = { NULL, // vfs_sysctl fuse_vfsop_setattr, // vfs_setattr #endif - { NULL, NULL, NULL, NULL, NULL, NULL, NULL } // vfs_reserved[] +#if VERSION_MAJOR < 16 + { +#endif + NULL, // vfs_ioctl + NULL, // vfs_vget_snapdir + NULL, // vfs_reserved5 + NULL, // vfs_reserved4 + NULL, // vfs_reserved3 + NULL, // vfs_reserved2 + NULL // vfs_reserved1 +#if VERSION_MAJOR < 16 + } +#endif }; struct vfs_fsentry fuse_vfs_entry = {