X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Ftypes.h;h=d8b993b2442967565e6787d028512a6cf886ea0e;hb=HEAD;hp=4579add21e3c8d6c4c4a5f06aac1b35f7c16338e;hpb=077257b83c68a36ea86f2d21c8395f60df710c21;p=sliver-openvswitch.git

diff --git a/include/linux/types.h b/include/linux/types.h
index 4579add21..d8b993b24 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.
@@ -23,7 +23,18 @@
  * <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>
@@ -44,4 +55,8 @@ typedef uint32_t __bitwise__ __be32;
 typedef uint64_t __bitwise__ __be64;
 #endif	/* no <linux/types.h> */
 
+#ifndef _WIN32
+typedef __u32 HANDLE;
+#endif
+
 #endif /* <linux/types.h> */