VirtualBox

Changeset 42784 in vbox


Ignore:
Timestamp:
Aug 12, 2012 8:31:36 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
80003
Message:

Linux 3.6-rc1 compile fix, spaces

Location:
trunk/src/VBox
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/drm/vboxvideo_crtc.c

    r39335 r42784  
    4444
    4545#include <linux/version.h>
    46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     46#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    4747
    4848#include <VBox/VBoxVideoGuest.h>

  • trunk/src/VBox/Additions/linux/drm/vboxvideo_dac.c

    r39335 r42784  
    4444
    4545#include <linux/version.h>
    46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     46#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    4747
    4848#include "vboxvideo_drv.h"

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

    r42164 r42784  
    5151
    5252#include <linux/version.h>
    53 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     53#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    5454# include <generated/autoconf.h>
    5555#else
    … …  
    8383int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
    8484{
    85 # if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 28)
     85# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
    8686    return drm_vblank_init(dev, 1);
    8787#else
    … …  
    8989#endif
    9090}
    91 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_RHEL63)
     91#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63)
    9292/* since linux-3.3.0-rc1 drm_driver::fops is pointer */
    9393static struct file_operations driver_fops =
    … …  
    107107    /* .driver_features = DRIVER_USE_MTRR, */
    108108    .load = vboxvideo_driver_load,
     109#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
    109110    .reclaim_buffers = drm_core_reclaim_buffers,
     111#endif
    110112    /* As of Linux 2.6.37, always the internal functions are used. */
    111 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) && !defined(DRM_RHEL61)
     113#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) && !defined(DRM_RHEL61)
    112114    .get_map_ofs = drm_core_get_map_ofs,
    113115    .get_reg_ofs = drm_core_get_reg_ofs,
    114116#endif
    115 # if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) && !defined(DRM_RHEL63)
     117# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63)
    116118    .fops =
    117119    {
    … …  
    121123        /* This was changed with Linux 2.6.33 but Fedora backported this
    122124         * change to their 2.6.32 kernel. */
    123 #if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33)
     125#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    124126        .unlocked_ioctl = drm_ioctl,
    125127#else
    … …  
    130132        .fasync = drm_fasync,
    131133    },
    132 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_RHEL63) */
     134#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) */
    133135    .fops = &driver_fops,
    134136#endif
    135 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     137#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
    136138    .pci_driver =
    137139    {
    … …  
    148150};
    149151
    150 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 39) || defined(DRM_RHEL61)
     152#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) || defined(DRM_RHEL61)
    151153static struct pci_driver pci_driver =
    152154{
    … …  
    158160static int __init vboxvideo_init(void)
    159161{
    160 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     162#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
    161163    return drm_init(&driver);
    162164#else
    … …  
    167169static void __exit vboxvideo_exit(void)
    168170{
    169 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     171#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
    170172    drm_exit(&driver);
    171173#else

  • trunk/src/VBox/Additions/linux/drm/vboxvideo_vga.c

    r39335 r42784  
    4444
    4545#include <linux/version.h>
    46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     46#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    4747
    4848#include "vboxvideo_drv.h"

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

    r41117 r42784  
    7979#elif defined(RT_OS_LINUX)
    8080#   include <linux/version.h>
    81 #   if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     81#   if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    8282#    include <generated/autoconf.h>
    8383#   else

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

    r40304 r42784  
    4141# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
    4242# include <linux/version.h>
    43 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     43# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    4444#  include <generated/autoconf.h>
    4545# else

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

    r41660 r42784  
    3636
    3737#include <linux/version.h>
    38 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
     38#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
    3939# include <generated/autoconf.h>
    4040#else

  • trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c

    r36947 r42784  
    5252DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
    5353{
    54 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
     54#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
    5555    /* See comment near MAX_RT_PRIO in linux/sched.h for details on
    5656       sched_priority. */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette