Spotlight: use async Tracker SPARQL API

[netatalk.git] / include / atalk / vfs.h

diff --git a/include/atalk/vfs.h b/include/atalk/vfs.h
index de1c008ce22d2f1b50e82d752cab64d195896fdf..6021c150987db56b02c701a5bac934ef54c90aa4 100644 (file)
--- a/include/atalk/vfs.h
+++ b/include/atalk/vfs.h
@@ -27,6 +27,7 @@
 
 #include <atalk/adouble.h>
 #include <atalk/volume.h>
+#include <atalk/acl.h>
 
 #define VFS_FUNC_ARGS_VALIDUPATH const struct vol *vol, const char *name
 #define VFS_FUNC_VARS_VALIDUPATH vol, name
@@ -61,8 +62,14 @@
 #define VFS_FUNC_ARGS_COPYFILE const struct vol *vol, int sfd, const char *src, const char *dst
 #define VFS_FUNC_VARS_COPYFILE vol, sfd, src, dst
 
+#ifdef HAVE_NFSV4_ACLS
 #define VFS_FUNC_ARGS_ACL const struct vol *vol, const char *path, int cmd, int count, void *aces
 #define VFS_FUNC_VARS_ACL vol, path, cmd, count, aces
+#endif
+#ifdef HAVE_POSIX_ACLS
+#define VFS_FUNC_ARGS_ACL const struct vol *vol, const char *path, acl_type_t type, int count, acl_t acl
+#define VFS_FUNC_VARS_ACL vol, path, type, count, acl
+#endif
 
 #define VFS_FUNC_ARGS_REMOVE_ACL const struct vol *vol, const char *path, int dir
 #define VFS_FUNC_VARS_REMOVE_ACL vol, path, dir
@@ -101,9 +108,11 @@ struct vfs_ops {
     int (*vfs_renamefile)    (VFS_FUNC_ARGS_RENAMEFILE);
     int (*vfs_copyfile)      (VFS_FUNC_ARGS_COPYFILE);
 
+#ifdef HAVE_ACLS
     /* ACLs */
     int (*vfs_acl)           (VFS_FUNC_ARGS_ACL);
     int (*vfs_remove_acl)    (VFS_FUNC_ARGS_REMOVE_ACL);
+#endif
 
     /* Extended Attributes */
     int (*vfs_ea_getsize)    (VFS_FUNC_ARGS_EA_GETSIZE);