summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2018-11-01 21:58:31 -0400
committerTavian Barnes <tavianator@tavianator.com>2018-11-01 21:58:31 -0400
commit2c4d653df0ae16bb221eb2a08314a051301236b5 (patch)
tree6ec84985a75d75de3934114f5351e12bbe0e3d23
parent8c3b9aaaab11be9d0fe24a72ebb16e171ca22125 (diff)
downloadbfs-2c4d653df0ae16bb221eb2a08314a051301236b5.tar.xz
util: Wrap __has_include()
-rw-r--r--mtab.c6
-rw-r--r--util.c2
-rw-r--r--util.h6
3 files changed, 8 insertions, 6 deletions
diff --git a/mtab.c b/mtab.c
index 4d9e1d8..a35641d 100644
--- a/mtab.c
+++ b/mtab.c
@@ -24,11 +24,7 @@
#include <sys/stat.h>
#include <sys/types.h>
-#ifndef __has_include
-# define __has_include(header) 0
-#endif
-
-#if __GLIBC__ || __has_include(<mntent.h>)
+#if __GLIBC__ || BFS_HAS_INCLUDE(<mntent.h>)
# define BFS_MNTENT 1
#elif BSD
# define BFS_MNTINFO 1
diff --git a/util.c b/util.c
index 64785be..7f68e7c 100644
--- a/util.c
+++ b/util.c
@@ -30,7 +30,7 @@
#include <sys/types.h>
#include <unistd.h>
-#if __GLIBC__ || __has_include(<sys/sysmacros.h>)
+#if __GLIBC__ || BFS_HAS_INCLUDE(<sys/sysmacros.h>)
# include <sys/sysmacros.h>
#endif
diff --git a/util.h b/util.h
index 18fc318..920d6e9 100644
--- a/util.h
+++ b/util.h
@@ -28,6 +28,12 @@
// Some portability concerns
+#ifdef __has_include
+# define BFS_HAS_INCLUDE(header) __has_include(header)
+#else
+# define BFS_HAS_INCLUDE(header) false
+#endif
+
#if !defined(FNM_CASEFOLD) && defined(FNM_IGNORECASE)
# define FNM_CASEFOLD FNM_IGNORECASE
#endif