From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 May 2025 12:11:02 +0000 (+0200)
Subject: file-has-acl: Fix compilation error on Solaris (regression 2025-05-09).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c68b107e921a79fefc62bb5337b856b95f0ffe0a;p=thirdparty%2Fgnulib.git

file-has-acl: Fix compilation error on Solaris (regression 2025-05-09).

* lib/file-has-acl.c (acl_get_fdfile): Don't define on platforms that
don't need it.
---

diff --git a/ChangeLog b/ChangeLog
index 74453491ae..85028d3684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-05-12  Bruno Haible  <bruno@clisp.org>
+
+	file-has-acl: Fix compilation error on Solaris (regression 2025-05-09).
+	* lib/file-has-acl.c (acl_get_fdfile): Don't define on platforms that
+	don't need it.
+
 2025-05-12  Bruno Haible  <bruno@clisp.org>
 
 	doc: Update doc about ACLs on Cygwin.
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index a356ee0d0b..a9cfbf3a16 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -382,10 +382,11 @@ acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
 }
 #endif
 
-#if (!USE_LINUX_XATTR && USE_ACL && !HAVE_ACL_EXTENDED_FILE \
-     && !HAVE_ACL_TYPE_EXTENDED)
+#if (!USE_LINUX_XATTR && USE_ACL && HAVE_ACL_GET_FILE \
+     && !HAVE_ACL_EXTENDED_FILE && !HAVE_ACL_TYPE_EXTENDED)
+/* FreeBSD, NetBSD >= 10, IRIX, Tru64, Cygwin >= 2.5 */
 
-# if HAVE_ACL_GET_FD && !HAVE_ACL_GET_LINK_NP
+# if HAVE_ACL_GET_FD && !HAVE_ACL_GET_LINK_NP /* IRIX, Tru64, Cygwin >= 2.5 */
 #  include <fcntl.h>
 #  ifdef O_PATH
 #   define acl_get_fd_np(fd, type) acl_get_fd (fd)