From 077daa21229ffaedda79588fa70fbaeae19ae998 Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Tue, 28 Mar 2000 19:46:53 +0000
Subject: [PATCH] Prevent capability.h from #including <linux/fs.h>.  When a
 2.3 <linux/fs.h> is included, we get conflicts between <string.h> and
 <linux/string.h> that make the compilation fail.  This change also eliminates
 compiler warnings when os.c is compiled on a system with a 2.2
 <linux/capability.h>.

---
 bin/named/unix/os.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 4e63432506..5fa90eacfb 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -44,6 +44,14 @@ static pid_t mainpid = 0;
 
 #ifdef HAVE_LINUX_CAPABILITY_H
 
+/*
+ * We define _LINUX_FS_H to prevent it from being included.  We don't need
+ * anything from it, and the files it includes cause warnings with 2.2
+ * kernels, and compilation failures (due to conflicts between <linux/string.h>
+ * and <string.h>) on 2.3 kernels.
+ */
+#define _LINUX_FS_H
+
 #include <sys/syscall.h>
 #include <linux/capability.h>