diff options
| author | Keith Packard <keithp@keithp.com> | 2010-06-05 21:07:15 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-05 21:12:41 -0700 |
| commit | 6bd5f0d75bca727c4686b20eee166c8cae472ba2 (patch) | |
| tree | e586f546b429435c92dc07e684c75df4afc6bfc2 | |
| parent | 6b306f43384e5c2143197e746a5a39c4ebb2583c (diff) | |
Fix exa_priv.h declarations of privates
exa_priv.h exposes the privates to the rest of the exa code, and yet
the declarations of the privates wasn't fixed when the exa.c versions were.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | exa/exa.c | 9 | ||||
| -rw-r--r-- | exa/exa_priv.h | 10 |
2 files changed, 10 insertions, 9 deletions
@@ -37,12 +37,9 @@ #include "exa_priv.h" #include "exa.h" -static DevPrivateKeyRec exaScreenPrivateKeyRec; -#define exaScreenPrivateKey (&exaScreenPrivateKeyRec) -static DevPrivateKeyRec exaPixmapPrivateKeyRec; -#define exaPixmapPrivateKey (&exaPixmapPrivateKeyRec) -static DevPrivateKeyRec exaGCPrivateKeyRec; -#define exaGCPrivateKey (&exaGCPrivateKeyRec) +DevPrivateKeyRec exaScreenPrivateKeyRec; +DevPrivateKeyRec exaPixmapPrivateKeyRec; +DevPrivateKeyRec exaGCPrivateKeyRec; #ifdef MITSHM static ShmFuncs exaShmFuncs = { NULL, NULL }; diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 14c99e946..58d04b0de 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -221,9 +221,13 @@ typedef struct { (PixmapWidthPaddingInfo[d].padRoundUp+1))) #endif -extern DevPrivateKey exaScreenPrivateKey; -extern DevPrivateKey exaPixmapPrivateKey; -extern DevPrivateKey exaGCPrivateKey; +extern DevPrivateKeyRec exaScreenPrivateKeyRec; +#define exaScreenPrivateKey (&exaScreenPrivateKeyRec) +extern DevPrivateKeyRec exaPixmapPrivateKeyRec; +#define exaPixmapPrivateKey (&exaPixmapPrivateKeyRec) +extern DevPrivateKeyRec exaGCPrivateKeyRec; +#define exaGCPrivateKey (&exaGCPrivateKeyRec) + #define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixLookupPrivate(&(s)->devPrivates, exaScreenPrivateKey)) #define ExaScreenPriv(s) ExaScreenPrivPtr pExaScr = ExaGetScreenPriv(s) |