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/xfree86/common/xf86VGAarbiter.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/xfree86/common/xf86VGAarbiter.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86VGAarbiter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c index 225fff06e..5cc24298b 100644 --- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c +++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c @@ -257,7 +257,7 @@ VGAarbiterCloseScreen(ScreenPtr pScreen) UNWRAP_SCREEN_INFO(FreeScreen); UNWRAP_SPRITE; - free((pointer) pScreenPriv); + free((void *) pScreenPriv); xf86VGAarbiterLock(xf86ScreenToScrn(pScreen)); val = (*pScreen->CloseScreen) (pScreen); xf86VGAarbiterUnlock(xf86ScreenToScrn(pScreen)); @@ -266,7 +266,7 @@ VGAarbiterCloseScreen(ScreenPtr pScreen) static void VGAarbiterBlockHandler(ScreenPtr pScreen, - pointer pTimeout, pointer pReadmask) + void *pTimeout, void *pReadmask) { SCREEN_PROLOG(BlockHandler); VGAGet(pScreen); @@ -277,7 +277,7 @@ VGAarbiterBlockHandler(ScreenPtr pScreen, static void VGAarbiterWakeupHandler(ScreenPtr pScreen, unsigned long result, - pointer pReadmask) + void *pReadmask) { SCREEN_PROLOG(WakeupHandler); VGAGet(pScreen); @@ -586,7 +586,7 @@ VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) } static void -VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) +VGAarbiterChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) { GC_UNWRAP(pGC); (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); @@ -860,7 +860,7 @@ VGAarbiterImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit, int yInit, unsigned int nglyph, - CharInfoPtr * ppci, pointer pglyphBase) + CharInfoPtr * ppci, void *pglyphBase) { ScreenPtr pScreen = pGC->pScreen; @@ -877,7 +877,7 @@ VGAarbiterPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit, int yInit, unsigned int nglyph, - CharInfoPtr * ppci, pointer pglyphBase) + CharInfoPtr * ppci, void *pglyphBase) { ScreenPtr pScreen = pGC->pScreen; |