Changeset 35647 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 20, 2011 11:35:55 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69559

Message:

Linux 2.6.38-rc1 autoconf.h mess

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/iprt.h (modified) (1 diff)
• r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/src/VBox/Runtime/include/internal/iprt.h

@@ -40 +40 @@
  && !defined(RT_NO_EXPORT_SYMBOL)
 # define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
-# ifndef AUTOCONF_INCLUDED
-#  include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+#  include <generated/autoconf.h>
+# else
+#  ifndef AUTOCONF_INCLUDED
+#   include <linux/autoconf.h>
+#  endif
 # endif
 # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
-#  include <linux/version.h>
 #  define MODVERSIONS
 #  if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 71)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -35 +35 @@
 #define bool linux_bool
 
-#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
-#endif
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+# include <generated/autoconf.h>
+#else
+# ifndef AUTOCONF_INCLUDED
+#  include <linux/autoconf.h>
+# endif
+#endif
 
 /* We only support 2.4 and 2.6 series kernels */