From 438af0c7d4bf60b408b259c88205ff2193195466 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 21 Sep 2014 18:11:28 +0200
Subject: libxtrans xkeyboard-config xserver mesa plink glproto git update 21
 Sep 2014

plink revision 10233
xserver          commit 28337cb14e4347e1dd7936c5393a22e042866687
xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a
glproto          commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0
libxtrans        commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
mesa             commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f
---
 xorg-server/dix/resource.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'xorg-server/dix/resource.c')

diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c
index 623d862d6..c254244a3 100644
--- a/xorg-server/dix/resource.c
+++ b/xorg-server/dix/resource.c
@@ -524,8 +524,10 @@ CreateNewResourceType(DeleteType deleteFunc, const char *name)
     resourceTypes[next].findSubResFunc = DefaultFindSubRes;
     resourceTypes[next].errorValue = BadValue;
 
+#if X_REGISTRY_RESOURCE
     /* Called even if name is NULL, to remove any previous entry */
     RegisterResourceName(next, name);
+#endif
 
     return next;
 }
-- 
cgit v1.2.3