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

exa: Clean up warnings 

Declare GC ops/funcs as const.
Use 'typeof' in the 'swap' macro to capture the right type.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-15 05:41:54 -08:00
parent 6e51645b47
commit 00438c9f94
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exa/exa.c
View File

@ -620,8 +620,8 @@ exaCreateGC(GCPtr pGC)
swap(pExaScr, pScreen, CreateGC); swap(pExaScr, pScreen, CreateGC);
if ((ret = (*pScreen->CreateGC) (pGC))) { if ((ret = (*pScreen->CreateGC) (pGC))) {
wrap(pExaGC, pGC, funcs, (GCFuncs *) &exaGCFuncs); wrap(pExaGC, pGC, funcs, &exaGCFuncs);
wrap(pExaGC, pGC, ops, (GCOps *) &exaOps); wrap(pExaGC, pGC, ops, &exaOps);
} }
swap(pExaScr, pScreen, CreateGC); swap(pExaScr, pScreen, CreateGC);

12
exa/exa_priv.h
View File

@ -248,11 +248,19 @@ extern DevPrivateKeyRec exaScreenPrivateKeyRec;
real->mem = priv->Saved##mem; \ real->mem = priv->Saved##mem; \
} }
#ifdef HAVE_TYPEOF
#define swap(priv, real, mem) {\
typeof(real->mem) tmp = priv->Saved##mem; \
priv->Saved##mem = real->mem; \
real->mem = tmp; \
}
#else
#define swap(priv, real, mem) {\ #define swap(priv, real, mem) {\
void *tmp = priv->Saved##mem; \ void *tmp = priv->Saved##mem; \
priv->Saved##mem = real->mem; \ priv->Saved##mem = real->mem; \
real->mem = tmp; \ real->mem = tmp; \
} }
#endif
#define EXA_PRE_FALLBACK(_screen_) \ #define EXA_PRE_FALLBACK(_screen_) \
ExaScreenPriv(_screen_); \ ExaScreenPriv(_screen_); \
@ -333,8 +341,8 @@ typedef struct {
typedef struct { typedef struct {
/* GC values from the layer below. */ /* GC values from the layer below. */
GCOps *Savedops; const GCOps *Savedops;
GCFuncs *Savedfuncs; const GCFuncs *Savedfuncs;
} ExaGCPrivRec, *ExaGCPrivPtr; } ExaGCPrivRec, *ExaGCPrivPtr;
typedef struct { typedef struct {