X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Ftypes.h;h=b88fb1c049133e861da54b9e5e74216a3a6d3402;hb=e368cad8ecf6dbf272b2a3775b2e3e5e2dc6a5cf;hp=845924ec0149cb125f75787f610352e2a5a91865;hpb=9ea0bccc83a84458d934966eae15c78f3ee2bac8;p=sliver-openvswitch.git

diff --git a/include/linux/types.h b/include/linux/types.h
index 845924ec0..b88fb1c04 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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>