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/Xext/xace.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/Xext/xace.c')
| -rw-r--r-- | xorg-server/Xext/xace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c index 026d3c5cf..d77b3126a 100644 --- a/xorg-server/Xext/xace.c +++ b/xorg-server/Xext/xace.c @@ -122,9 +122,9 @@ XaceHook(int hook, ...) u.res.client = va_arg(ap, ClientPtr); u.res.id = va_arg(ap, XID); u.res.rtype = va_arg(ap, RESTYPE); - u.res.res = va_arg(ap, pointer); + u.res.res = va_arg(ap, void *); u.res.ptype = va_arg(ap, RESTYPE); - u.res.parent = va_arg(ap, pointer); + u.res.parent = va_arg(ap, void *); u.res.access_mode = va_arg(ap, Mask); u.res.status = Success; /* default allow */ @@ -288,7 +288,7 @@ XaceCensorImage(ClientPtr client, pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h, depth, bitsPerPixel, - widthBytesLine, (pointer) pBuf); + widthBytesLine, (void *) pBuf); if (!pPix) { failed = TRUE; goto failSafe; |