aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/vgahw/vgaCmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xfree86/vgahw/vgaCmap.c')
-rw-r--r--xorg-server/hw/xfree86/vgahw/vgaCmap.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/vgahw/vgaCmap.c b/xorg-server/hw/xfree86/vgahw/vgaCmap.c
index 44043c6c7..5bd38b468 100644
--- a/xorg-server/hw/xfree86/vgahw/vgaCmap.c
+++ b/xorg-server/hw/xfree86/vgahw/vgaCmap.c
@@ -36,8 +36,7 @@
#include "xf86.h"
#include "vgaHW.h"
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#include "dgaproc.h"
@@ -277,8 +276,8 @@ vgaUninstallColormap(pmap)
if ( pmap != miInstalledMaps[pmap->pScreen->myNum] )
return;
- defColormap = (ColormapPtr) LookupIDByType( pmap->pScreen->defColormap,
- RT_COLORMAP);
+ dixLookupResourceByType((pointer *)&defColormap, pmap->pScreen->defColormap,
+ RT_COLORMAP, serverClient, DixInstallAccess);
if (defColormap == miInstalledMaps[pmap->pScreen->myNum])
return;