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/hw/xfree86/exa/examodule.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/hw/xfree86/exa/examodule.c')
| -rw-r--r-- | xorg-server/hw/xfree86/exa/examodule.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/exa/examodule.c b/xorg-server/hw/xfree86/exa/examodule.c index 6238582c0..356fd16ca 100644 --- a/xorg-server/hw/xfree86/exa/examodule.c +++ b/xorg-server/hw/xfree86/exa/examodule.c @@ -42,8 +42,8 @@ typedef struct _ExaXorgScreenPrivRec { OptionInfoPtr options;
} ExaXorgScreenPrivRec, *ExaXorgScreenPrivPtr;
-static int exaXorgScreenPrivateKeyIndex;
-static DevPrivateKey exaXorgScreenPrivateKey = &exaXorgScreenPrivateKeyIndex;
+static DevPrivateKeyRec exaXorgScreenPrivateKeyRec;
+#define exaXorgScreenPrivateKey (&exaXorgScreenPrivateKeyRec)
typedef enum {
EXAOPT_MIGRATION_HEURISTIC,
@@ -114,6 +114,9 @@ exaDDXDriverInit(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ExaXorgScreenPrivPtr pScreenPriv;
+ if (!dixRegisterPrivateKey(&exaXorgScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+ return;
+
pScreenPriv = calloc(1, sizeof(ExaXorgScreenPrivRec));
if (pScreenPriv == NULL)
return;
|