[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1221567763-17060-1-git-send-email-kirill@shutemov.name>
Date: Tue, 16 Sep 2008 15:22:43 +0300
From: "Kirill A. Shutemov" <kirill@...temov.name>
To: linux-kernel@...r.kernel.org
Cc: "Kirill A. Shutemov" <kirill@...temov.name>,
Ulrich Drepper <drepper@...hat.com>,
Davide Libenzi <davidel@...ilserver.org>,
David Woodhouse <dwmw2@...radead.org>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] linux/inotify.h: do not include <linux/fcntl.h> in userspace
<linux/fcntl.h> conflicts with glibc's <fcntl.h>.
It breaks building kdelibs, kdepim and pinot. It's regression itroduced
by commit 4006553.
Signed-off-by: Kirill A. Shutemov <kirill@...temov.name>
Cc: Ulrich Drepper <drepper@...hat.com>
Cc: Davide Libenzi <davidel@...ilserver.org>
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
---
include/linux/inotify.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index bd57857..792b6f0 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -7,8 +7,10 @@
#ifndef _LINUX_INOTIFY_H
#define _LINUX_INOTIFY_H
+#ifdef __KERNEL__
/* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h>
+#endif
#include <linux/types.h>
/*
--
1.5.6.5.GIT
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists