From 4ca66bfaeb49e6fe85ccd8d8f4f11dbb96213636 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 13 Oct 2011 14:38:13 -0700 Subject: Fix broken build in XenServer DDK 5.6.100-39265p. Avoids errors like the following: In file included from ./include/openvswitch/types.h:21, from ./lib/vconn.h:21, from tests/test-vconn.c:18: /usr/include/sys/types.h:52: error: conflicting types for 'ino_t' /usr/include/linux/types.h:14: error: previous declaration of 'ino_t' was here /usr/include/sys/types.h:62: error: conflicting types for 'dev_t' /usr/include/linux/types.h:13: error: previous declaration of 'dev_t' was here /usr/include/sys/types.h:67: error: conflicting types for 'gid_t' /usr/include/linux/types.h:27: error: previous declaration of 'gid_t' was here /usr/include/sys/types.h:72: error: conflicting types for 'mode_t' /usr/include/linux/types.h:15: error: previous declaration of 'mode_t' was here /usr/include/sys/types.h:77: error: conflicting types for 'nlink_t' /usr/include/linux/types.h:16: error: previous declaration of 'nlink_t' was here /usr/include/sys/types.h:82: error: conflicting types for 'uid_t' /usr/include/linux/types.h:26: error: previous declaration of 'uid_t' was here /usr/include/sys/types.h:90: error: conflicting types for 'off_t' /usr/include/linux/types.h:17: error: previous declaration of 'off_t' was here --- include/linux/types.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/types.h b/include/linux/types.h index 4579add2..13112e8f 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -23,7 +23,13 @@ * to allow to work, that is, it defines * the __u and __be types. */ -#if __KERNEL__ || HAVE_LINUX_TYPES_H +#ifdef __KERNEL__ +#include_next +#elif defined(HAVE_LINUX_TYPES_H) +/* With some combinations of kernel and userspace headers, including both + * and only works if you do so in that order, so + * force it. */ +#include #include_next #else /* no */ #include -- cgit v1.2.3