frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Keith Packard 2010-06-05 21:07:15 -07:00
parent 6b306f4338
commit 6bd5f0d75b
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
exa/exa.c
View File

@ -37,12 +37,9 @@
#include "exa_priv.h" #include "exa_priv.h"
#include "exa.h" #include "exa.h"
static DevPrivateKeyRec exaScreenPrivateKeyRec; DevPrivateKeyRec exaScreenPrivateKeyRec;
#define exaScreenPrivateKey (&exaScreenPrivateKeyRec) DevPrivateKeyRec exaPixmapPrivateKeyRec;
static DevPrivateKeyRec exaPixmapPrivateKeyRec; DevPrivateKeyRec exaGCPrivateKeyRec;
#define exaPixmapPrivateKey (&exaPixmapPrivateKeyRec)
static DevPrivateKeyRec exaGCPrivateKeyRec;
#define exaGCPrivateKey (&exaGCPrivateKeyRec)
#ifdef MITSHM #ifdef MITSHM
static ShmFuncs exaShmFuncs = { NULL, NULL }; static ShmFuncs exaShmFuncs = { NULL, NULL };

10
exa/exa_priv.h
View File

@ -221,9 +221,13 @@ typedef struct {
(PixmapWidthPaddingInfo[d].padRoundUp+1))) (PixmapWidthPaddingInfo[d].padRoundUp+1)))
#endif #endif
extern DevPrivateKey exaScreenPrivateKey; extern DevPrivateKeyRec exaScreenPrivateKeyRec;
extern DevPrivateKey exaPixmapPrivateKey; #define exaScreenPrivateKey (&exaScreenPrivateKeyRec)
extern DevPrivateKey exaGCPrivateKey; extern DevPrivateKeyRec exaPixmapPrivateKeyRec;
#define exaPixmapPrivateKey (&exaPixmapPrivateKeyRec)
extern DevPrivateKeyRec exaGCPrivateKeyRec;
#define exaGCPrivateKey (&exaGCPrivateKeyRec)
#define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixLookupPrivate(&(s)->devPrivates, exaScreenPrivateKey)) #define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixLookupPrivate(&(s)->devPrivates, exaScreenPrivateKey))
#define ExaScreenPriv(s) ExaScreenPrivPtr pExaScr = ExaGetScreenPriv(s) #define ExaScreenPriv(s) ExaScreenPrivPtr pExaScr = ExaGetScreenPriv(s)