From patchwork Wed Dec 5 23:21:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13381 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6AABE23FCC for ; Wed, 5 Dec 2012 23:21:36 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 24626A18034 for ; Wed, 5 Dec 2012 23:21:36 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so4255352iag.11 for ; Wed, 05 Dec 2012 15:21:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=WFPoMnHmHc8EfsVJkvty7lbdmc5z85tJCZzNCn9aQLg=; b=JRAJLGhfLqqpHe8kYEF9zyl1J73TH9fZ6N0HWtgp3pRUSU4OmzihRNleSKWKk6W2Xa +KNIdRzsixDCDmKu0IDu3A+dLysl0RGHijBXNacRdVMplbiwh6A51LhUUPCSXpunIc/R wMTaTd6NvRDL0kopQQIoYLfp/53fFIJwcOer4BQy6iWOqeNMlLIm79FOpsu3Z6LrusGs l1wXp4sPkhnx9Ohgj2CLfLv8uCf02CGAdavYkP7oJcUbfyuhb2a0cvQI4ffX207nfEJ0 IHBv3oWsVqeq4Gm1AY4yG0Qg5Ruis4YnkHsA2oniCjpcOIK393XcjzkU4yFn5Ncqk6K6 x25A== Received: by 10.50.152.137 with SMTP id uy9mr3798405igb.62.1354749695564; Wed, 05 Dec 2012 15:21:35 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp374767igt; Wed, 5 Dec 2012 15:21:35 -0800 (PST) Received: by 10.236.44.196 with SMTP id n44mr23102372yhb.117.1354749694334; Wed, 05 Dec 2012 15:21:34 -0800 (PST) Received: from mail-ye0-f174.google.com (mail-ye0-f174.google.com [209.85.213.174]) by mx.google.com with ESMTPS id p20si3076720ank.165.2012.12.05.15.21.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 15:21:34 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.174 as permitted sender) client-ip=209.85.213.174; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.174 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-ye0-f174.google.com with SMTP id m6so999658yen.33 for ; Wed, 05 Dec 2012 15:21:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=WFPoMnHmHc8EfsVJkvty7lbdmc5z85tJCZzNCn9aQLg=; b=zmC/bbvAI9nTUfF4ZJKfg/9HCDPNMDeCDGUPn4hUaI+nfqHOcsc6MN6/9vZnkxplPW k6LCqbez3NgJf69JaRHnMj6EA7zcOwlQiRxIIhHD466k6QC5WhmIC4bwlXrZeXLC8GOx 7pqaM1Wr+ODhnxCqg6HyFutqGz43tyHR0pRHe2ConMfKXJI+TzuUOz6fua8FrczUaqMS FH3kyR7VcMSfNMnwk6hBQKeRSGMucRZW7am/c7R9kyUzlS05RRkDZJObvYuUjKMZXeJG 2uufj2UQcY0ClnM1voJpTjuKPzf2o9mNoJx3Rik8WzjCpOAhwmBQAsKo5ISs30DRrnMA 7E7Q== Received: by 10.236.138.49 with SMTP id z37mr23063347yhi.35.1354749693551; Wed, 05 Dec 2012 15:21:33 -0800 (PST) Received: from localhost (ppp-70-129-132-217.dsl.rcsntx.swbell.net. [70.129.132.217]) by mx.google.com with ESMTPS id l35sm6767857yhi.12.2012.12.05.15.21.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 15:21:33 -0800 (PST) From: Rob Clark To: xorg-devel@lists.x.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH xserver] hw/dmx: fix build without GLX Date: Wed, 5 Dec 2012 17:21:27 -0600 Message-Id: <1354749687-25495-1-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.8.0.1 X-Gm-Message-State: ALoCoQkY1HcwKHIEbSKdyj6lJ99WO3thhTlLzX2FIQt37SOKF/EQ0oX7riGr5E7jiqljiw3OHxk5 Fixes this compile break that showed up on arm recently: dmxinit.c:746:26: error: 'glxSupported' undeclared (first use in this function) dmxinit.c:746:26: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Rob Clark Reviewed-by: Alex Deucher --- hw/dmx/dmxinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 7a50aeb..7de402b 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -740,10 +740,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) /* Check if GLX extension exists on all back-end servers */ for (i = 0; i < dmxNumScreens; i++) glxSupported &= (dmxScreens[i].glxMajorOpcode > 0); -#endif if (serverGeneration == 1) dmxAddExtensions(glxSupported); +#endif /* Tell dix layer about the backend displays */ for (i = 0; i < dmxNumScreens; i++) {