aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/registry.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
committermarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
commitd1d04c7bd3f1465b7bb6690022d086c6bb005b70 (patch)
tree058884f2af1a2994f07d887c88bfdea63cc47703 /xorg-server/dix/registry.c
parent52b728b4b397d26f8841848ee921950e083991d0 (diff)
downloadvcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.gz
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.bz2
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.zip
Synchronised files
Diffstat (limited to 'xorg-server/dix/registry.c')
-rw-r--r--xorg-server/dix/registry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index aa2edf3e8..319973920 100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
@@ -204,7 +204,7 @@ RegisterResourceName(RESTYPE resource, const char *name)
resource &= TypeMask;
while (resource >= nresource) {
- if (!double_size(&resources, nresource, sizeof(char *)))
+ if (!double_size((void*)&resources, nresource, sizeof(char *)))
return;
nresource = nresource ? nresource * 2 : BASE_SIZE;
}
@@ -300,7 +300,7 @@ dixResetRegistry(void)
free(errors[nerror]);
free(errors);
- free(resources);
+ free((void*)resources);
requests = NULL;
nminor = NULL;