From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/hw/dmx/input/dmxbackend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xorg-server/hw/dmx/input/dmxbackend.c') diff --git a/xorg-server/hw/dmx/input/dmxbackend.c b/xorg-server/hw/dmx/input/dmxbackend.c index 807e02328..56abe8013 100644 --- a/xorg-server/hw/dmx/input/dmxbackend.c +++ b/xorg-server/hw/dmx/input/dmxbackend.c @@ -101,7 +101,7 @@ typedef struct _myPrivate { #endif /** Create and return a private data structure. */ -pointer +void * dmxBackendCreatePrivate(DeviceIntPtr pDevice) { GETDMXLOCALFROMPDEVICE; @@ -115,7 +115,7 @@ dmxBackendCreatePrivate(DeviceIntPtr pDevice) * verify that the structure was actually created by * #dmxBackendCreatePrivate. */ void -dmxBackendDestroyPrivate(pointer private) +dmxBackendDestroyPrivate(void *private) { free(private); } @@ -262,7 +262,7 @@ dmxBackendOffscreen(int screen, int x, int y) /** This routine is called from #dmxCoreMotion for each motion * event. \a x and \a y are global coordinants. */ void -dmxBackendUpdatePosition(pointer private, int x, int y) +dmxBackendUpdatePosition(void *private, int x, int y) { GETPRIVFROMPRIVATE; int screen = miPointerGetScreen(inputInfo.pointer)->myNum; @@ -500,7 +500,7 @@ dmxBackendCollectEvents(DevicePtr pDev, * event processing actually takes place here, but this is a convenient * place to update the pointer. */ void -dmxBackendProcessInput(pointer private) +dmxBackendProcessInput(void *private) { GETPRIVFROMPRIVATE; @@ -650,7 +650,7 @@ dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info) /** Process #DMXFunctionType functions. The only function handled here * is to acknowledge a pending server shutdown. */ int -dmxBackendFunctions(pointer private, DMXFunctionType function) +dmxBackendFunctions(void *private, DMXFunctionType function) { switch (function) { case DMX_FUNCTION_TERMINATE: -- cgit v1.2.3