From patchwork Fri Feb 1 22:13:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14409 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 3766E23F96 for ; Fri, 1 Feb 2013 22:13:41 +0000 (UTC) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by fiordland.canonical.com (Postfix) with ESMTP id E8C37A18381 for ; Fri, 1 Feb 2013 22:13:40 +0000 (UTC) Received: by mail-ve0-f181.google.com with SMTP id d10so3372168vea.12 for ; Fri, 01 Feb 2013 14:13:40 -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=VsjeO5BxkzDyVnVWeJTTx8Bwn0UaS1embd54bvJ76nHUFUESSAndao0/25jiwoYTMe wjAgVOmo4qZHV4zkezud7exA4rVzoana79xYaMj7U692SlyaN2rWE728MQpvNfIejTCU YXMakNeUhoZ0NcwvREhfyE8e4jKHJpNXfbJsc7U4UxrrSkhokxymf72is8UFNknyzZHf /73h2gTq/NO+6hRW/kHeZ+vVqVEfc8WOpHjX6qogGiKLqT3Y+jfNR9QFWssOaQRoHQkd pzP+1utZgVx8hru4MmEXrvWRzFdyXTgG1a5HdOqY7Z2E6QQVJMznUWH+85H+oHxIXmR3 FOLg== X-Received: by 10.52.27.50 with SMTP id q18mr11329665vdg.20.1359756820425; Fri, 01 Feb 2013 14:13:40 -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 zo8csp139226vec; Fri, 1 Feb 2013 14:13:39 -0800 (PST) X-Received: by 10.43.134.65 with SMTP id ib1mr10541600icc.12.1359756819739; Fri, 01 Feb 2013 14:13:39 -0800 (PST) Received: from mail-ie0-x236.google.com (ie-in-x0236.1e100.net [2607:f8b0:4001:c03::236]) by mx.google.com with ESMTPS id as7si2874564igc.54.2013.02.01.14.13.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:13:39 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::236 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::236; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::236 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-f182.google.com with SMTP id k14so3950700iea.13 for ; Fri, 01 Feb 2013 14:13:39 -0800 (PST) X-Received: by 10.50.12.201 with SMTP id a9mr221974igc.10.1359756819452; Fri, 01 Feb 2013 14:13:39 -0800 (PST) Received: from mars.mantorvilleexpress.com ([70.35.96.184]) by mx.google.com with ESMTPS id xn10sm3999047igb.4.2013.02.01.14.13.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 14:13:38 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.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:13:31 -0600 Message-Id: <1359756812-29545-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQl271KSSIA+pVsnlyBop2xauunt29TztlrhVLCPoRe6/gCvITz5MOEtB2FkPTzHX/cKoWvD 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; }