From patchwork Fri Feb 1 22:10:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14405 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 A839423F96 for ; Fri, 1 Feb 2013 22:10:28 +0000 (UTC) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by fiordland.canonical.com (Postfix) with ESMTP id 288BDA1822E for ; Fri, 1 Feb 2013 22:10:28 +0000 (UTC) Received: by mail-vb0-f51.google.com with SMTP id fq11so2696121vbb.24 for ; Fri, 01 Feb 2013 14:10:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=j1+AFdYgCABehXOBRsc+T6NcYyzKnSTD0bZ92PNwmyE=; b=ZAbMGZax3KCAEeqlcL7OMURcxHG/sIFTuAOjtyHl566Jyhr4johIdtpY9MrK8KVQvT z9/Z0L23iOg4geQrDpQKOAVHs2teVJC2pjo6L1U1ga54p1q/y8CDnBYVHl5pmp0OEO8J kiT38HhW+qLXHvP1qSptYQUOfbit0pJyz+14AglS75NlRkCCQcQ+A9GDetdx9Q2f1SRD ITKr3B2j1rmJYnvV4EgweOz5EuTSyDPxRQnc4zi8AHBa1+9vcqsXni915UWVr5boxlWf vARMZwIye3cIXWmiYrfSC9Z9mm/TmOkz2YNBVqJ7V9X7xCg0XwOf9ooY1vKGI8W34Uz7 9x5w== X-Received: by 10.52.24.98 with SMTP id t2mr7804672vdf.69.1359756627659; Fri, 01 Feb 2013 14:10:27 -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.58.252.8 with SMTP id zo8csp139108vec; Fri, 1 Feb 2013 14:10:27 -0800 (PST) X-Received: by 10.50.13.175 with SMTP id i15mr146096igc.75.1359756626447; Fri, 01 Feb 2013 14:10:26 -0800 (PST) Received: from mail-ia0-x232.google.com (mail-ia0-x232.google.com [2607:f8b0:4001:c02::232]) by mx.google.com with ESMTPS id g10si2860423ign.72.2013.02.01.14.10.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:10:26 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::232 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::232 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) smtp.mail=tom.gall@linaro.org Received: by mail-ia0-f178.google.com with SMTP id y26so5897030iab.23 for ; Fri, 01 Feb 2013 14:10:25 -0800 (PST) X-Received: by 10.50.151.211 with SMTP id us19mr135600igb.84.1359756625038; Fri, 01 Feb 2013 14:10:25 -0800 (PST) Received: from mars.mantorvilleexpress.com ([70.35.96.184]) by mx.google.com with ESMTPS id mj6sm3967035igc.9.2013.02.01.14.10.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:10:23 -0800 (PST) From: Tom Gall To: piglit@lists.linaro.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/2] android: file compile errors w shader_runner.c Date: Fri, 1 Feb 2013 16:10:15 -0600 Message-Id: <1359756616-29412-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQn2SWzn9M8agCXR2VSfzIGJo64BLpbkXyViTZx4OPAD4+Nx5qi9CUM57i6kHuoh2lHq5+qX On Android -Werror=return-type is set for C code, as such there are two cases were I've added a return 0 after an assert. Signed-off-by: Tom Gall --- tests/shaders/shader_runner.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index d83228e..20f1ee0 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -351,6 +351,7 @@ compare(float ref, float value, enum comparison cmp) } assert(!"Should not get here."); + return 0; } @@ -370,6 +371,7 @@ comparison_string(enum comparison cmp) } assert(!"Should not get here."); + return 0; }