[Intel-gfx] [PATCH 4/7] uxa: Fix const-cast warning.

Eric Anholt eric at anholt.net
Sat Nov 17 22:11:11 CET 2012


The server interfaces take a non-const GCOps, because it expects you
to be able to modify them.
---
 uxa/uxa-accel.c |    2 +-
 uxa/uxa-priv.h  |    2 +-
 uxa/uxa.c       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 76425fe..522dd67 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -1038,7 +1038,7 @@ fallback:
 	uxa_check_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y);
 }
 
-const GCOps uxa_ops = {
+GCOps uxa_ops = {
 	uxa_fill_spans,
 	uxa_set_spans,
 	uxa_put_image,
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
index 3f639e7..4661575 100644
--- a/uxa/uxa-priv.h
+++ b/uxa/uxa-priv.h
@@ -296,7 +296,7 @@ void
 uxa_add_traps(PicturePtr pPicture,
 	      INT16 x_off, INT16 y_off, int ntrap, xTrap * traps);
 
-extern const GCOps uxa_ops;
+extern GCOps uxa_ops;
 
 #ifdef RENDER
 
diff --git a/uxa/uxa.c b/uxa/uxa.c
index 2635b50..b15d3c1 100644
--- a/uxa/uxa.c
+++ b/uxa/uxa.c
@@ -268,7 +268,7 @@ uxa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 	}
 
 set_ops:
-	pGC->ops = (GCOps *) & uxa_ops;
+	pGC->ops = & uxa_ops;
 }
 
 static GCFuncs uxaGCFuncs = {
-- 
1.7.10.4




More information about the Intel-gfx mailing list