aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/damageext
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-15 21:37:10 +0100
committermarha <marha@users.sourceforge.net>2014-01-15 21:37:10 +0100
commitb7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch)
tree1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/damageext
parent7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff)
parent1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff)
downloadvcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz
vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2
vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xkeyboard-config xserver git update 15 jan 2014 randrproto libfontenc mesa xserver git update 10 Jan 2014 randsrproto fontconfig libX11 git update 6 Jan 2014 Conflicts: mesalib/src/glsl/builtin_functions.cpp mesalib/src/glsl/ir_builder.h xorg-server/Xext/xres.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/winwindowswm.c xorg-server/include/gc.h xorg-server/os/access.c
Diffstat (limited to 'xorg-server/damageext')
-rw-r--r--xorg-server/damageext/damageext.c6
-rw-r--r--xorg-server/damageext/damageextint.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c
index 8e6d97b9e..bc7840416 100644
--- a/xorg-server/damageext/damageext.c
+++ b/xorg-server/damageext/damageext.c
@@ -243,7 +243,7 @@ DamageExtCreate(DrawablePtr pDrawable, DamageReportLevel level,
return NULL;
}
- if (!AddResource(id, DamageExtType, (pointer) pDamageExt))
+ if (!AddResource(id, DamageExtType, (void *) pDamageExt))
return NULL;
DamageExtRegister(pDrawable, pDamageExt->pDamage,
@@ -567,7 +567,7 @@ SProcDamageDispatch(ClientPtr client)
}
static void
-DamageClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+DamageClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -585,7 +585,7 @@ DamageResetProc(ExtensionEntry * extEntry)
}
static int
-FreeDamageExt(pointer value, XID did)
+FreeDamageExt(void *value, XID did)
{
DamageExtPtr pDamageExt = (DamageExtPtr) value;
diff --git a/xorg-server/damageext/damageextint.h b/xorg-server/damageext/damageextint.h
index e50149501..7a7096d27 100644
--- a/xorg-server/damageext/damageextint.h
+++ b/xorg-server/damageext/damageextint.h
@@ -58,7 +58,7 @@ typedef struct _DamageExt {
} DamageExtRec, *DamageExtPtr;
#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
- int rc = dixLookupResourceByType((pointer *)&(pDamageExt), rid, \
+ int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \
DamageExtType, client, mode); \
if (rc != Success) \
return rc; \