From 34d6492436c0f4a81822769b24d8c7816d0226ad Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 10 Jul 2010 06:55:58 -0700 Subject: [PATCH] xquartz: Delete compile-time-constant DRIGCRec.driOps field. The driOps field of this structure is never set to anything but &driGCOps, and this structure is not visible outside this source file. Just use the constant in the one place the field was used. Signed-off-by: Jamey Sharp Cc: Jeremy Huddleston Reviewed-by: Jeremy Huddleston --- hw/xquartz/xpr/driWrap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c index 65843b83f..de5c4a2cf 100644 --- a/hw/xquartz/xpr/driWrap.c +++ b/hw/xquartz/xpr/driWrap.c @@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. typedef struct { GCOps *originalOps; - GCOps *driOps; } DRIGCRec; typedef struct { @@ -86,9 +85,7 @@ DRIUnwrapGC(GCPtr pGC) { static void DRIWrapGC(GCPtr pGC) { - DRIGCRec *pGCPriv = DRIGetGCPriv(pGC); - - pGC->ops = pGCPriv->driOps; + pGC->ops = &driGCOps; } static void @@ -513,7 +510,6 @@ DRICreateGC(GCPtr pGC) { if(ret) { pGCPriv->originalOps = pGC->ops; pGC->ops = &driGCOps; - pGCPriv->driOps = &driGCOps; } wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);