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/fb/fboverlay.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/fb/fboverlay.c')
| -rw-r--r-- | xorg-server/fb/fboverlay.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c index c6802e4b4..935bf1b50 100644 --- a/xorg-server/fb/fboverlay.c +++ b/xorg-server/fb/fboverlay.c @@ -104,7 +104,7 @@ fbOverlayWindowLayer(WindowPtr pWin) for (i = 0; i < pScrPriv->nlayers; i++) if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin)) == - (pointer) pScrPriv->layer[i].u.run.pixmap) + (void *) pScrPriv->layer[i].u.run.pixmap) return i; return 0; } @@ -115,7 +115,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen) int i; FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen); PixmapPtr pPixmap; - pointer pbits; + void *pbits; int width; int depth; BoxRec box; @@ -250,8 +250,8 @@ fbOverlayWindowExposures(WindowPtr pWin, Bool fbOverlaySetupScreen(ScreenPtr pScreen, - pointer pbits1, - pointer pbits2, + void *pbits1, + void *pbits2, int xsize, int ysize, int dpix, @@ -287,8 +287,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen) Bool fbOverlayFinishScreenInit(ScreenPtr pScreen, - pointer pbits1, - pointer pbits2, + void *pbits1, + void *pbits2, int xsize, int ysize, int dpix, |