From patchwork Sat Nov 17 21:11:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 1759951 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 9B5C1DF2A2 for ; Sat, 17 Nov 2012 21:12:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CBF7E5F37 for ; Sat, 17 Nov 2012 13:12:47 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 02D81E5F05; Sat, 17 Nov 2012 13:11:15 -0800 (PST) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id C8687648A9; Sat, 17 Nov 2012 13:11:15 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id CBB95E63B24; Sat, 17 Nov 2012 13:11:14 -0800 (PST) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Sat, 17 Nov 2012 13:11:11 -0800 Message-Id: <1353186674-7234-4-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353186674-7234-1-git-send-email-eric@anholt.net> References: <1353186674-7234-1-git-send-email-eric@anholt.net> Subject: [Intel-gfx] [PATCH 4/7] uxa: Fix const-cast warning. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org 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 = {