From e3d0fe06bd566b659a7c36b5d9892c6f6b9caa89 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Mon, 23 Jan 2012 05:26:40 +0000
Subject: Respin features.h usage so that we correctly test for features before
 we use them. Some BSD libc implementations may have one or the other flag,
 but not both.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 src/rc/checkpath.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/rc')

diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index 4ad4ea7d..0aee4465 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <features.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -68,8 +67,11 @@ do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type, bool trunc
 			if (!mode) /* 664 */
 				mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH;
 			flags = O_CREAT|O_NDELAY|O_WRONLY|O_NOCTTY;
-#ifdef __USE_XOPEN2K8
-			flags |= O_CLOEXEC|O_NOFOLLOW;
+#ifdef O_CLOEXEC
+			flags |= O_CLOEXEC;
+#endif
+#ifdef O_NOFOLLOW
+			flags |= O_NOFOLLOW;
 #endif
 			if (trunc)
 				flags |= O_TRUNC;
-- 
cgit v1.2.3