diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 21:08:15 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 21:08:15 +0000 |
| commit | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (patch) | |
| tree | 10b8d598d3c821cdb25569d4bd750b7ad8cae269 /xorg-server/dix/resource.c | |
| parent | d34fc70fab4607f70184206a592397c97c3e478e (diff) | |
| download | vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.gz vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.bz2 vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.zip | |
Switched to xorg-server-1.7.99.2
Diffstat (limited to 'xorg-server/dix/resource.c')
| -rw-r--r-- | xorg-server/dix/resource.c | 8 |
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; } |