summaryrefslogtreecommitdiffstats
path: root/include/linux/mroute.h
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-03 09:22:52 +0900
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-04 10:44:42 +0900
commit80a9492a33dd7d852465625022d56ff76d62174d (patch)
tree7f8976d803a1d7fddae9b53164a8d5774aa15bb5 /include/linux/mroute.h
parent2e8046271f68198dd37451017c1a4a2432e4ec68 (diff)
downloadblackbird-op-linux-80a9492a33dd7d852465625022d56ff76d62174d.tar.gz
blackbird-op-linux-80a9492a33dd7d852465625022d56ff76d62174d.zip
[IPV4] MROUTE: Adjust include files for user-space.
<linux/mroute.h> needs <linux/types.h>. Avoid including <linux/in.h> in user-space, which conflicts with standard <netinet/in.h>. Add basic struct and constant in <linux/pim.h>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'include/linux/mroute.h')
-rw-r--r--include/linux/mroute.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c41b4217ae3b..de4decfa1bfc 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,10 @@
#define __LINUX_MROUTE_H
#include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
#include <linux/in.h>
+#endif
#include <linux/pim.h>
/*
OpenPOWER on IntegriCloud