Rev version, fix compilation error when ACL support is not available

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

diff --git a/include/atalk/acl.h b/include/atalk/acl.h
index 44ea9655a3bcccaf820c11a340548bf222a9892b..53d10b19aa011383c1d8f40788f4984332e70b18 100644 (file)
--- a/include/atalk/acl.h
+++ b/include/atalk/acl.h
@@ -1,5 +1,4 @@
 /*
-   $Id: acl.h,v 1.1 2009-10-14 15:04:01 franklahm Exp $
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
@@ -20,19 +19,28 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
+
+#ifdef HAVE_SOLARIS_ACLS
+#include <sys/acl.h>
+#endif  /* HAVE_SOLARIS_ACLS */
+
+#ifdef HAVE_POSIX_ACLS
+#include <sys/types.h>
 #include <sys/acl.h>
-#endif  /* HAVE_NFSv4_ACLS */
+#endif /* HAVE_POSIX_ACLS */
 
-/* Solaris NFSv4 ACL stuff */
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_SOLARIS_ACLS
+#define chmod nfsv4_chmod
 extern int get_nfsv4_acl(const char *name, ace_t **retAces);
-extern int remove_acl(const char *name);
 extern int strip_trivial_aces(ace_t **saces, int sacecount);
 extern int strip_nontrivial_aces(ace_t **saces, int sacecount);
 extern ace_t *concat_aces(ace_t *aces1, int ace1count, ace_t *aces2, int ace2count);
 extern int nfsv4_chmod(char *name, mode_t mode);
-#endif /* HAVE_NFSv4_ACLS */
+#endif /* HAVE_SOLARIS_ACLS */
+
+extern int remove_acl_vfs(const char *name);
 
+#endif /* HAVE_ACLS */
 
-#endif  /* ATALK_ACL_H */
+#endif /* ATALK_ACL_H */