From 6bd5f0d75bca727c4686b20eee166c8cae472ba2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 5 Jun 2010 21:07:15 -0700 Subject: 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 Signed-off-by: Keith Packard --- exa/exa.c | 9 +++------ exa/exa_priv.h | 10 +++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'exa') diff --git a/exa/exa.c b/exa/exa.c index bbe93f6df..118a11098 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -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) -- cgit v1.2.3