From patchwork Fri Feb 1 22:11:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14407 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 8560023F96 for ; Fri, 1 Feb 2013 22:12:13 +0000 (UTC) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by fiordland.canonical.com (Postfix) with ESMTP id 39C54A1822E for ; Fri, 1 Feb 2013 22:12:13 +0000 (UTC) Received: by mail-vb0-f49.google.com with SMTP id s24so2759977vbi.36 for ; Fri, 01 Feb 2013 14:12:12 -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=mkcMYv8SVdxVaa951D7ikMK2nQGYTPg2pU9/oUDUg9sqjBkaDBiqzOzaCB3imMLPcE xp/gchH2aj42xS8ckrRtABwFr6C3X1KipmucteF8L5MgYtMeUKPFI8arw/B3vNO6nPoC lrnaFFDxASwwwEM6TNor87Xinxvvq9RwGRnw+HmgbaAIQLSteexW5Z+E98Gsellk7pum kpIlpojXpFLn+cRk/O7tIFI+KkKEO6im5lktpevEAQN+jH6XCWnR5E1ziG+ooYx1bNBO M9gzVqHrBaj0MWQ2JRVXLm+iZFtm8vjL08xiKEFpVkh443krAr7TH7IKLAzvdnIjXqKi Tj/A== X-Received: by 10.52.21.146 with SMTP id v18mr11063532vde.79.1359756732728; Fri, 01 Feb 2013 14:12:12 -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 zo8csp139170vec; Fri, 1 Feb 2013 14:12:12 -0800 (PST) X-Received: by 10.50.152.132 with SMTP id uy4mr159041igb.62.1359756731953; Fri, 01 Feb 2013 14:12:11 -0800 (PST) Received: from mail-ie0-x22c.google.com (ie-in-x022c.1e100.net [2607:f8b0:4001:c03::22c]) by mx.google.com with ESMTPS id x6si5029068ict.6.2013.02.01.14.12.11 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:12:11 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::22c is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::22c; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::22c 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-ie0-f172.google.com with SMTP id c10so3984930ieb.31 for ; Fri, 01 Feb 2013 14:12:11 -0800 (PST) X-Received: by 10.50.185.196 with SMTP id fe4mr207008igc.17.1359756731667; Fri, 01 Feb 2013 14:12:11 -0800 (PST) Received: from mars.mantorvilleexpress.com ([70.35.96.184]) by mx.google.com with ESMTPS id fa6sm4371766igb.2.2013.02.01.14.12.09 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:12:10 -0800 (PST) From: Tom Gall To: piglit@lists.freedesk.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:11:59 -0600 Message-Id: <1359756720-29476-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmePmWOC62612WJyQH0HkO6PJJpE1tQv6bZtc4hVi6GLfvF2Bog74qw/YsLKHN9pnBvuiVc 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; }