Changeset 40941 in vbox for trunk/include

Timestamp:

Apr 16, 2012 2:34:59 PM (13 years ago)

Author:

vboxsync

Message:

runtime: smaller linux 3.4-rc3 build fix.

File:

• trunk/include/iprt/types.h (modified) (1 diff)

trunk/include/iprt/types.h

@@ -126 +126 @@
 #   define __inline __inline
 #  endif
-#  include <linux/types.h>
-#  include <linux/stddef.h>
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+#   undef __KERNEL__
+    /**
+     * linux 3.4-rc3 unconditionally defines NULL in as ((void *)0)
+     * don't let it break our build
+     */
+#   include <linux/stddef.h>
+#   define __KERNEL__
+#   include <linux/types.h>
+#  else
+#   include <linux/types.h>
+#   include <linux/stddef.h>
+#  endif
 #  undef uintptr_t
 #  ifdef __GNUC__