From: Jim Meyering <meyering@redhat.com>
Date: Mon, 9 Jun 2008 09:28:55 +0000 (+0200)
Subject: add more guards around definition of ACE_-related code
X-Git-Tag: v0.1~7285
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1c6985c95d2d33c12ad08e96650afae7818cc07e;p=gnulib.git

add more guards around definition of ACE_-related code

* lib/file-has-acl.c (acl_ace_nontrivial): Define only if
ALLOW and ACE_OWNER are also defined.
---

diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index 9589db965..5b851b96e 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -146,7 +146,7 @@ acl_nontrivial (int count, aclent_t *entries)
   return 0;
 }
 
-# ifdef ACE_GETACL
+# if defined ACE_GETACL && defined ALLOW && defined ACE_OWNER
 
 /* Test an ACL retrieved with ACE_GETACL.
    Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.