From 46387a7dcda93e7df9f5baa3ead753c0feeff122 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 6 Nov 2022 11:52:49 -0500 Subject: util: Get rid of BFS_HAS_INCLUDE() wrapper for __has_include() Since __has_include() needs special preprocessing rules (e.g. not expanding `linux` in `__has_include()`, macros that expand to __has_include() do not necessarily behave correctly. Instead, we have to directly test `#if __has_include(...)`. See https://bugs.llvm.org/show_bug.cgi?id=37990 for more details. --- src/fsade.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fsade.h') diff --git a/src/fsade.h b/src/fsade.h index e964112..bd7fc5b 100644 --- a/src/fsade.h +++ b/src/fsade.h @@ -25,16 +25,16 @@ #include "util.h" #include -#define BFS_CAN_CHECK_ACL BFS_HAS_SYS_ACL +#define BFS_CAN_CHECK_ACL BFS_USE_SYS_ACL_H -#if !defined(BFS_CAN_CHECK_CAPABILITIES) && BFS_HAS_SYS_CAPABILITY && !__FreeBSD__ +#if !defined(BFS_CAN_CHECK_CAPABILITIES) && BFS_USE_SYS_CAPABILITY_H && !__FreeBSD__ # include # ifdef CAP_CHOWN # define BFS_CAN_CHECK_CAPABILITIES true # endif #endif -#define BFS_CAN_CHECK_XATTRS (BFS_HAS_SYS_EXTATTR || BFS_HAS_SYS_XATTR) +#define BFS_CAN_CHECK_XATTRS (BFS_USE_SYS_EXTATTR_H || BFS_USE_SYS_XATTR_H) struct BFTW; -- cgit v1.2.3