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>.
This commit is contained in:
Bob Halley 2000-03-28 19:46:53 +00:00
parent d497aeb8cf
commit 077daa2122

View file

@ -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>