From: Paul Eggert Date: Wed, 13 Jan 2016 19:10:28 +0000 (-0800) Subject: acl-permissions: port to USE_ACL==0 platforms X-Git-Tag: v1.0~6859 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=cff4b380b8a48071b341af28d93501f5d18b46cb;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 1434b3d150..858615ae4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2016-01-13 Paul Eggert + + 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 mktime: rename macro to avoid glibc clash diff --git a/lib/acl-internal.c b/lib/acl-internal.c index 569e2f9c9e..4de60c30ec 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 526e9f0778..636273e0fb 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