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.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/fsade.c') diff --git a/src/fsade.c b/src/fsade.c index 9e5374f..7a7201e 100644 --- a/src/fsade.c +++ b/src/fsade.c @@ -32,9 +32,9 @@ # include #endif -#if BFS_HAS_SYS_EXTATTR +#if BFS_USE_SYS_EXTATTR_H # include -#elif BFS_HAS_SYS_XATTR +#elif BFS_USE_SYS_XATTR_H # include #endif @@ -303,7 +303,7 @@ int bfs_check_xattrs(const struct BFTW *ftwbuf) { const char *path = fake_at(ftwbuf); ssize_t len; -#if BFS_HAS_SYS_EXTATTR +#if BFS_USE_SYS_EXTATTR_H ssize_t (*extattr_list)(const char *, int, void*, size_t) = ftwbuf->type == BFS_LNK ? extattr_list_link : extattr_list_file; @@ -342,7 +342,7 @@ int bfs_check_xattr_named(const struct BFTW *ftwbuf, const char *name) { const char *path = fake_at(ftwbuf); ssize_t len; -#if BFS_HAS_SYS_EXTATTR +#if BFS_USE_SYS_EXTATTR_H ssize_t (*extattr_get)(const char *, int, const char *, void*, size_t) = ftwbuf->type == BFS_LNK ? extattr_get_link : extattr_get_file; -- cgit v1.2.3