Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.11.3-keyboard-build-issues.patch

    Annotation of /trunk/xorg-server/patches/xorg-server-1.11.3-keyboard-build-issues.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1628 - (hide annotations) (download)
    Sun Jan 22 00:14:53 2012 UTC (12 years, 4 months ago) by niro
    File size: 1966 byte(s) 
    -build fix
    1 niro 1628 --- xorg-server-1.11.3/hw/kdrive/linux/keyboard.c.org 2011-12-17 08:32:26.955371326 +0100
    2     +++ xorg-server-1.11.3/hw/kdrive/linux/keyboard.c 2011-12-17 08:32:45.179135298 +0100
    3     @@ -692,7 +692,7 @@
    4     return !Success;
    5    
    6     fd = LinuxConsoleFd;
    7     - ki->driverPrivate = (void *) fd;
    8     + ki->driverPrivate = (void *) (intptr_t) fd;
    9    
    10     ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
    11     tcgetattr (fd, &LinuxTermios);
    12     @@ -724,7 +724,7 @@
    13     if (!ki)
    14     return;
    15    
    16     - fd = (int) ki->driverPrivate;
    17     + fd = (int) (intptr_t) ki->driverPrivate;
    18    
    19     KdUnregisterFd(ki, fd, FALSE);
    20     ioctl(fd, KDSKBMODE, LinuxKbdTrans);
    21     @@ -753,7 +753,7 @@
    22     if (!ki)
    23     return;
    24    
    25     - ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7);
    26     + ioctl ((int) (intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
    27     }
    28    
    29     KdKeyboardDriver LinuxKeyboardDriver = {
    30     --- xorg-server-1.11.3/hw/kdrive/linux/ms.c.org 2011-12-17 08:33:00.929507448 +0100
    31     +++ xorg-server-1.11.3/hw/kdrive/linux/ms.c 2011-12-17 08:33:21.106650997 +0100
    32     @@ -152,7 +152,7 @@
    33     }
    34     if (KdRegisterFd (port, MsRead, pi))
    35     return TRUE;
    36     - pi->driverPrivate = (void *)port;
    37     + pi->driverPrivate = (void *) (intptr_t)port;
    38    
    39     return Success;
    40    
    41     @@ -164,7 +164,7 @@
    42     static void
    43     MsDisable (KdPointerInfo *pi)
    44     {
    45     - KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
    46     + KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
    47     }
    48    
    49     static void
    50     --- xorg-server-1.11.3/hw/kdrive/linux/ps2.c.org 2011-12-17 08:33:34.930310934 +0100
    51     +++ xorg-server-1.11.3/hw/kdrive/linux/ps2.c 2011-12-17 08:33:53.580751546 +0100
    52     @@ -159,7 +159,7 @@
    53     return BadAlloc;
    54     }
    55    
    56     - pi->driverPrivate = (void *)fd;
    57     + pi->driverPrivate = (void *)(intptr_t)fd;
    58    
    59     return Success;
    60     }
    61     @@ -168,7 +168,7 @@
    62     static void
    63     Ps2Disable (KdPointerInfo *pi)
    64     {
    65     - KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
    66     + KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
    67     }
    68    
    69     static void