openvswitch.h: Change OVS_KEY_ATTR_TUN_ID from 100 to 63.

[sliver-openvswitch.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 845924e..fb05744 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -20,10 +20,21 @@
 /* On Linux, this header file just includes <linux/types.h>.
  *
  * On other platforms, this header file implements just enough of
- * <linux/types.h> to allow datapath-protocol.h to work, that is, it defines
+ * <linux/types.h> to allow <linux/openvswitch.h> to work, that is, it defines
  * the __u<N> and __be<N> types. */
 
-#if __KERNEL__ || HAVE_LINUX_TYPES_H
+#ifdef __KERNEL__
+#include_next <linux/types.h>
+#elif defined(HAVE_LINUX_TYPES_H)
+/* With some combinations of kernel and userspace headers, including both
+ * <sys/types.h> and <linux/types.h> only works if you do so in that order, so
+ * force it.  */
+
+#ifdef __CHECKER__
+#define __CHECK_ENDIAN__
+#endif
+
+#include <sys/types.h>
 #include_next <linux/types.h>
 #else  /* no <linux/types.h> */
 #include <stdint.h>