diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/mi/micmap.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/mi/micmap.c')
| -rw-r--r-- | xorg-server/mi/micmap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xorg-server/mi/micmap.c b/xorg-server/mi/micmap.c index 33dc2de51..456b7621d 100644 --- a/xorg-server/mi/micmap.c +++ b/xorg-server/mi/micmap.c @@ -40,15 +40,14 @@ #include "globals.h"
#include "micmap.h"
-static int micmapScrPrivateKeyIndex;
-DevPrivateKey micmapScrPrivateKey = &micmapScrPrivateKeyIndex;
+DevPrivateKeyRec micmapScrPrivateKeyRec;
int
miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{
if (GetInstalledmiColormap(pScreen)) {
*pmaps = GetInstalledmiColormap(pScreen)->mid;
- return (1);
+ return 1;
}
return 0;
}
@@ -311,6 +310,9 @@ miCreateDefColormap(ScreenPtr pScreen) ColormapPtr cmap;
int alloctype;
+ if (!dixRegisterPrivateKey(&micmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))
+ return FALSE;
+
for (pVisual = pScreen->visuals;
pVisual->vid != pScreen->rootVisual;
pVisual++)
|