From 46387a7dcda93e7df9f5baa3ead753c0feeff122 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
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(<linux/stat.h>)`, 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/util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/util.c')

diff --git a/src/util.c b/src/util.c
index b1a038a..bb2e1cc 100644
--- a/src/util.c
+++ b/src/util.c
@@ -31,17 +31,17 @@
 #include <unistd.h>
 #include <wchar.h>
 
-#if BFS_HAS_SYS_PARAM
+#if BFS_USE_SYS_PARAM_H
 #	include <sys/param.h>
 #endif
 
-#if BFS_HAS_SYS_SYSMACROS
+#if BFS_USE_SYS_SYSMACROS_H
 #	include <sys/sysmacros.h>
-#elif BFS_HAS_SYS_MKDEV
+#elif BFS_USE_SYS_MKDEV_H
 #	include <sys/mkdev.h>
 #endif
 
-#if BFS_HAS_UTIL
+#if BFS_USE_UTIL_H
 #	include <util.h>
 #endif
 
-- 
cgit v1.2.3