Changeset 35647 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Linux 2.6.38-rc1 autoconf.h mess

Location:

trunk

Files:

• include/iprt/types.h (modified) (1 diff)
• src/VBox/Additions/linux/drm/vboxvideo_drm.c (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• src/VBox/Runtime/include/internal/iprt.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/include/iprt/types.h

@@ -102 +102 @@
 #  define false linux_false
 #  define uintptr_t linux_uintptr_t
-#  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
 #  include <linux/types.h>

trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

@@ -50 +50 @@
  */
 
-#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
-#include <linux/version.h>
 #include <linux/module.h>
 #include "version-generated.h"

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -76 +76 @@
 
 #elif defined(RT_OS_LINUX)
-#   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
-#   include <linux/version.h>
 #   if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #       define MODVERSIONS

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 */