diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-15 22:02:58 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:14:49 -0800 |
| commit | 2f6e8eb70d527541178433933d6230466421bd15 (patch) | |
| tree | 93c53a2279350f90638ed37933cbea31ebd77adb /miext | |
| parent | c706fb0db86d6946482700d65ad6803c4daaa6f9 (diff) | |
damage: Clean up warnings
GC funcs and ops are const now, so all wrappers need to declare them
as such.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'miext')
| -rw-r--r-- | miext/damage/damage.c | 3 | ||||
| -rw-r--r-- | miext/damage/damagestr.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 173fe5070..55d8c412e 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -359,7 +359,7 @@ damageCreateGC(GCPtr pGC) #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \ damageGCPriv(pGC); \ - GCFuncs *oldFuncs = pGC->funcs; \ + const GCFuncs *oldFuncs = pGC->funcs; \ unwrap(pGCPriv, pGC, funcs); \ unwrap(pGCPriv, pGC, ops); \ @@ -379,7 +379,6 @@ damageCreateGC(GCPtr pGC) static void damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { - drawableDamage(pDrawable); DAMAGE_GC_FUNC_PROLOGUE(pGC); (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable); pGCPriv->ops = pGC->ops; /* just so it's not NULL */ diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 36753ee20..278615634 100644 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -76,8 +76,8 @@ typedef struct _damageScrPriv { } DamageScrPrivRec, *DamageScrPrivPtr; typedef struct _damageGCPriv { - GCOps *ops; - GCFuncs *funcs; + const GCOps *ops; + const GCFuncs *funcs; } DamageGCPrivRec, *DamageGCPrivPtr; /* XXX should move these into damage.c, damageScrPrivateIndex is static */ |