diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-29 07:22:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-29 07:22:59 +0000 |
| commit | 2ed8e0e263e27934ba97c00d4820dab5ec08b548 (patch) | |
| tree | 8ec0340f8100b6824afc3592a586b97d669f0256 /xorg-server | |
| parent | 87027d4d788c04d3f721b27eb718207bbf30f61c (diff) | |
| parent | 24abc56b37a3ec32a03b7eafccd96607ae13ea89 (diff) | |
| download | vcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.tar.gz vcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.tar.bz2 vcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/exa/exa_priv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h index 1b8cf294a..373c8f013 100644 --- a/xorg-server/exa/exa_priv.h +++ b/xorg-server/exa/exa_priv.h @@ -228,10 +228,10 @@ extern DevPrivateKeyRec exaPixmapPrivateKeyRec; extern DevPrivateKeyRec exaGCPrivateKeyRec;
#define exaGCPrivateKey (&exaGCPrivateKeyRec)
-#define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixLookupPrivate(&(s)->devPrivates, exaScreenPrivateKey))
+#define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixGetPrivate(&(s)->devPrivates, exaScreenPrivateKey))
#define ExaScreenPriv(s) ExaScreenPrivPtr pExaScr = ExaGetScreenPriv(s)
-#define ExaGetGCPriv(gc) ((ExaGCPrivPtr)dixLookupPrivate(&(gc)->devPrivates, exaGCPrivateKey))
+#define ExaGetGCPriv(gc) ((ExaGCPrivPtr)dixGetPrivateAddr(&(gc)->devPrivates, exaGCPrivateKey))
#define ExaGCPriv(gc) ExaGCPrivPtr pExaGC = ExaGetGCPriv(gc)
/*
@@ -282,8 +282,7 @@ extern DevPrivateKeyRec exaGCPrivateKeyRec; #define EXA_PIXMAP_SCORE_PINNED 1000
#define EXA_PIXMAP_SCORE_INIT 1001
-#define ExaGetPixmapPriv(p) ((ExaPixmapPrivPtr)dixLookupPrivate(&(p)->devPrivates, exaPixmapPrivateKey))
-#define ExaSetPixmapPriv(p,a) dixSetPrivate(&(p)->devPrivates, exaPixmapPrivateKey, a)
+#define ExaGetPixmapPriv(p) ((ExaPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, exaPixmapPrivateKey))
#define ExaPixmapPriv(p) ExaPixmapPrivPtr pExaPixmap = ExaGetPixmapPriv(p)
#define EXA_RANGE_PITCH (1 << 0)
|