diff options
Diffstat (limited to 'xorg-server/dbe')
| -rw-r--r-- | xorg-server/dbe/dbe.c | 12 | ||||
| -rw-r--r-- | xorg-server/dbe/midbe.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/dbe/dbe.c b/xorg-server/dbe/dbe.c index 5524615e2..8896720e7 100644 --- a/xorg-server/dbe/dbe.c +++ b/xorg-server/dbe/dbe.c @@ -322,7 +322,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client) if (status == Success) { pDbeWindowPriv->IDs[add_index] = stuff->buffer; if (!AddResource(stuff->buffer, dbeWindowPrivResType, - (pointer) pDbeWindowPriv)) { + (void *) pDbeWindowPriv)) { pDbeWindowPriv->IDs[add_index] = DBE_FREE_ID_ELEMENT; if (pDbeWindowPriv->nBufferIDs == 0) { @@ -378,12 +378,12 @@ ProcDbeDeallocateBackBufferName(ClientPtr client) REQUEST(xDbeDeallocateBackBufferNameReq); DbeWindowPrivPtr pDbeWindowPriv; int rc, i; - pointer val; + void *val; REQUEST_SIZE_MATCH(xDbeDeallocateBackBufferNameReq); /* Buffer name must be valid */ - rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer, + rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer, dbeWindowPrivResType, client, DixDestroyAccess); if (rc != Success) @@ -726,7 +726,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client) REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq); - rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer, + rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer, dbeWindowPrivResType, client, DixGetAttrAccess); if (rc == Success) { @@ -1125,7 +1125,7 @@ DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC) * *****************************************************************************/ static int -DbeDrawableDelete(pointer pDrawable, XID id) +DbeDrawableDelete(void *pDrawable, XID id) { return Success; @@ -1143,7 +1143,7 @@ DbeDrawableDelete(pointer pDrawable, XID id) * *****************************************************************************/ static int -DbeWindowPrivDelete(pointer pDbeWinPriv, XID id) +DbeWindowPrivDelete(void *pDbeWinPriv, XID id) { DbeScreenPrivPtr pDbeScreenPriv; DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr) pDbeWinPriv; diff --git a/xorg-server/dbe/midbe.c b/xorg-server/dbe/midbe.c index 3663fddcc..0479ecc5e 100644 --- a/xorg-server/dbe/midbe.c +++ b/xorg-server/dbe/midbe.c @@ -202,7 +202,7 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction) /* Associate the new ID with an existing pixmap. */ if (!AddResource(bufId, dbeDrawableResType, - (pointer) pDbeWindowPriv->pBackBuffer)) { + (void *) pDbeWindowPriv->pBackBuffer)) { return BadAlloc; } @@ -230,7 +230,7 @@ miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv) for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++) { ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType, - (pointer) pDbeWindowPriv->pBackBuffer); + (void *) pDbeWindowPriv->pBackBuffer); } } /* miDbeAliasBuffers() */ |