aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/resource.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-20 22:23:03 +0000
committermarha <marha@users.sourceforge.net>2009-12-20 22:23:03 +0000
commitc438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch)
tree9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/dix/resource.c
parentd842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff)
parentd8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff)
downloadvcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz
vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2
vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/dix/resource.c')
-rw-r--r--xorg-server/dix/resource.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c
index e1fdad4fb..91d0cfb1c 100644
--- a/xorg-server/dix/resource.c
+++ b/xorg-server/dix/resource.c
@@ -141,10 +141,10 @@ Equipment Corporation.
#endif
#include "xace.h"
#include <assert.h>
+#include "registry.h"
#ifdef XSERVER_DTRACE
#include <sys/types.h>
-#include "registry.h"
typedef const char *string;
#include "Xserver-dtrace.h"
@@ -197,7 +197,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
}
RESTYPE
-CreateNewResourceType(DeleteType deleteFunc)
+CreateNewResourceType(DeleteType deleteFunc, char *name)
{
RESTYPE next = lastResourceType + 1;
DeleteType *funcs;
@@ -214,6 +214,10 @@ CreateNewResourceType(DeleteType deleteFunc)
lastResourceType = next;
DeleteFuncs = funcs;
DeleteFuncs[next] = deleteFunc;
+
+ /* Called even if name is NULL, to remove any previous entry */
+ RegisterResourceName(next, name);
+
return next;
}