Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.8.0-vnc-alloc-devicepair-fix.patch

    Contents of /trunk/xorg-server/patches/xorg-server-1.8.0-vnc-alloc-devicepair-fix.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1498 - (show annotations) (download)
    Mon Aug 22 11:09:52 2011 UTC (12 years, 8 months ago) by niro
    File size: 2109 byte(s) 
    -added patch to fix symbol export issues with vnc modules
    1 diff --git a/include/input.h b/include/input.h
    2 index 8561308..63f981e 100644
    3 --- a/include/input.h
    4 +++ b/include/input.h
    5 @@ -432,7 +432,7 @@ extern void CreateClassesChangedEvent(EventListPtr event,
    6 DeviceIntPtr master,
    7 DeviceIntPtr slave,
    8 int type);
    9 -extern int GetPointerEvents(
    10 +extern _X_EXPORT int GetPointerEvents(
    11 EventListPtr events,
    12 DeviceIntPtr pDev,
    13 int type,
    14 @@ -442,7 +442,7 @@ extern int GetPointerEvents(
    15 int num_valuators,
    16 int *valuators);
    17
    18 -extern int GetKeyboardEvents(
    19 +extern _X_EXPORT int GetKeyboardEvents(
    20 EventListPtr events,
    21 DeviceIntPtr pDev,
    22 int type,
    23 @@ -493,7 +493,7 @@ extern int AttachDevice(ClientPtr client,
    24 extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
    25 extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
    26
    27 -extern int AllocDevicePair(ClientPtr client,
    28 +extern _X_EXPORT int AllocDevicePair(ClientPtr client,
    29 char* name,
    30 DeviceIntPtr* ptr,
    31 DeviceIntPtr* keybd,
    32 @@ -505,7 +505,7 @@ extern void DeepCopyDeviceClasses(DeviceIntPtr from,
    33 DeviceChangedEvent *dce);
    34
    35 /* Helper functions. */
    36 -extern int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
    37 +extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
    38 KeyCode **modkeymap, int *max_keys_per_mod);
    39 extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
    40 int max_keys_per_mod);
    41 diff --git a/include/xkbsrv.h b/include/xkbsrv.h
    42 index a5d25d0..b3a8319 100644
    43 --- a/include/xkbsrv.h
    44 +++ b/include/xkbsrv.h
    45 @@ -906,7 +906,7 @@ extern Bool XkbCopyKeymap(
    46 XkbDescPtr /* dst */,
    47 XkbDescPtr /* src */);
    48
    49 -extern Bool XkbCopyDeviceKeymap(
    50 +extern _X_EXPORT Bool XkbCopyDeviceKeymap(
    51 DeviceIntPtr /* dst */,
    52 DeviceIntPtr /* src */);
    53