diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
| commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
| tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/hw/dmx/dmxwindow.c | |
| parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
| download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip | |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/hw/dmx/dmxwindow.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxwindow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c index 9b8a3840e..1c235273c 100644 --- a/xorg-server/hw/dmx/dmxwindow.c +++ b/xorg-server/hw/dmx/dmxwindow.c @@ -86,7 +86,7 @@ dmxCreateRootWindow(WindowPtr pWindow) parent = dmxScreen->scrnWin; /* This is our "Screen" window */ visual = dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual; - dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), + dixLookupResourceByType((void **) &pCmap, wColormap(pWindow), RT_COLORMAP, NullClient, DixUnknownAccess); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); @@ -192,7 +192,7 @@ dmxGetDefaultWindowAttributes(WindowPtr pWindow, ColormapPtr pCmap; dmxColormapPrivPtr pCmapPriv; - dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), + dixLookupResourceByType((void **) &pCmap, wColormap(pWindow), RT_COLORMAP, NullClient, DixUnknownAccess); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); *cmap = pCmapPriv->cmap; @@ -561,7 +561,7 @@ dmxDoChangeWindowAttributes(WindowPtr pWindow, ColormapPtr pCmap; dmxColormapPrivPtr pCmapPriv; - dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow), + dixLookupResourceByType((void **) &pCmap, wColormap(pWindow), RT_COLORMAP, NullClient, DixUnknownAccess); pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap); attribs->colormap = pCmapPriv->cmap; |