From d1d04c7bd3f1465b7bb6690022d086c6bb005b70 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Dec 2011 15:22:40 +0100
Subject: Synchronised files

---
 xorg-server/dix/registry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/dix')

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;
-- 
cgit v1.2.3