[PATCH] acl-permissions: port to USE_ACL==0 platforms

[Paul Eggert]

I ran into this problem when building bleeding-edge GNU Emacs
with gcc -fsanitize=address on Fedora 23.  On this platform
the ACL library does not pass the 'configure' test and Emacs
then does not build due in part to what appear to be typos in the
ACL part of Gnulib.
* lib/acl-internal.c (free_permission_context):
* lib/acl-internal.h (struct permission_context):
Test whether USE_ACL is nonzero, not whether it is defined.
---
 ChangeLog          | 12 ++++++++++++
 lib/acl-internal.c |  2 +-
 lib/acl-internal.h |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1434b3d..858615a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-13  Paul Eggert  <address@hidden>
+
+       acl-permissions: port to USE_ACL==0 platforms
+       I ran into this problem when building bleeding-edge GNU Emacs
+       with gcc -fsanitize=address on Fedora 23.  On this platform
+       the ACL library does not pass the 'configure' test and Emacs
+       then does not build due in part to what appear to be typos in the
+       ACL part of Gnulib.
+       * lib/acl-internal.c (free_permission_context):
+       * lib/acl-internal.h (struct permission_context):
+       Test whether USE_ACL is nonzero, not whether it is defined.
+
 2016-01-12  Martin Sebor  <address@hidden>
 
        mktime: rename macro to avoid glibc clash
diff --git a/lib/acl-internal.c b/lib/acl-internal.c
index 569e2f9..4de60c3 100644
--- a/lib/acl-internal.c
+++ b/lib/acl-internal.c
@@ -478,7 +478,7 @@ acl_nontrivial (int count, struct acl *entries)
 void
 free_permission_context (struct permission_context *ctx)
 {
-#ifdef USE_ACL
+#if USE_ACL
 # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
   if (ctx->acl)
     acl_free (ctx->acl);
diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index 526e9f0..636273e 100644
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -255,7 +255,7 @@ extern int acl_nontrivial (int count, struct acl *entries);
 
 struct permission_context {
   mode_t mode;
-#ifdef USE_ACL
+#if USE_ACL
 # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
   acl_t acl;
 #  if !HAVE_ACL_TYPE_EXTENDED
-- 
2.5.0