[PATCH] Fix two warnings about incompatible pointer types
Tomas Carnecky
tom at dbservice.com
Wed Feb 4 11:36:49 PST 2009
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
---
Is xf86GetMotionEvents() still being used by anyone? I couldn't
find any reference to it inside the xserver, and its use has
been put under '#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0'
in xf86-input-void and -mouse.
hw/xfree86/common/xf86Helper.c | 2 +-
xkb/xkbAccessX.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 732a1fd..6b9b8f0 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2738,5 +2738,5 @@ int
xf86GetMotionEvents(DeviceIntPtr pDev, xTimecoord *buff, unsigned long start,
unsigned long stop, ScreenPtr pScreen, BOOL core)
{
- return GetMotionHistory(pDev, buff, start, stop, pScreen, core);
+ return GetMotionHistory(pDev, (xTimecoord **) buff, start, stop, pScreen, core);
}
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index c7f7439..f29787e 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -691,7 +691,7 @@ XkbSrvInfoPtr xkbi = dev->key->xkbInfo;
unsigned changed = 0;
ProcessInputProc backupproc;
xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
-deviceKeyButtonPointer *kbp = xE;
+deviceKeyButtonPointer *kbp = (deviceKeyButtonPointer *) xE;
xkbi->shiftKeyCount = 0;
xkbi->lastPtrEventTime= kbp->time;
--
1.6.1.2
More information about the xorg
mailing list