From patchwork Tue Feb 5 14:21:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mans Rullgard X-Patchwork-Id: 14553 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 0EA5823F99 for ; Tue, 5 Feb 2013 14:21:25 +0000 (UTC) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 94327A18D00 for ; Tue, 5 Feb 2013 14:21:24 +0000 (UTC) Received: by mail-la0-f52.google.com with SMTP id fs12so194958lab.39 for ; Tue, 05 Feb 2013 06:21:24 -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:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=D3Z4NeocqilW6JgaBBH+80bbbh+xNy95G1BflVA64cY=; b=QllmvMJraTRUv70kD4Ny846NvapRJDEqb0TP83BHGAWTo0nRGCoxiowB6pFHChGxgS V70T425vEFdRPrhtBAjzT4xGe458lHM9hTKGMyjlsWbc1E+uePY3He6Z7Ob9LbaMaOb8 pNJhoMgstE8eFx3NVj1ocVp2jqcvQPdQtsA42hLNSahspXjbUxx2rLBZOaTdz4kLSO88 BQS48RX9skHrNSvf9E53/VhrRQnvpGiFV7dD7kP01PXBjLiLWqPav1nQJ9u1Dqsi7hon cJb/r/5VvJI3dA9xMYWfu89PQnllkj6Z72EVwRqeSBUW/Rv98BTq72CLHsjwg0qNY9ag wCQw== X-Received: by 10.152.144.38 with SMTP id sj6mr22834906lab.48.1360074084201; Tue, 05 Feb 2013 06:21:24 -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.112.91.146 with SMTP id ce18csp135615lbb; Tue, 5 Feb 2013 06:21:23 -0800 (PST) X-Received: by 10.180.97.4 with SMTP id dw4mr17651033wib.16.1360074079837; Tue, 05 Feb 2013 06:21:19 -0800 (PST) Received: from unicorn.mansr.com (unicorn.mansr.com. [78.86.181.103]) by mx.google.com with ESMTP id fv7si5067588wib.106.2013.02.05.06.21.19; Tue, 05 Feb 2013 06:21:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) client-ip=78.86.181.103; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) smtp.mail=mru@mansr.com Received: by unicorn.mansr.com (Postfix, from userid 51770) id 120A815AF5; Tue, 5 Feb 2013 14:21:19 +0000 (GMT) From: Mans Rullgard To: png-mng-implement@lists.sourceforge.net Cc: patches@linaro.org Subject: [PATCH 2/2] pngpriv: protect some #includes from PNG_VERSION_INFO_ONLY Date: Tue, 5 Feb 2013 14:21:11 +0000 Message-Id: <1360074071-27671-2-git-send-email-mans.rullgard@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360074071-27671-1-git-send-email-mans.rullgard@linaro.org> References: <1360074071-27671-1-git-send-email-mans.rullgard@linaro.org> X-Gm-Message-State: ALoCoQnG9fed2SXe/ZT+ps5NArtjP/pAm6bbZtcA8DLcbj410SKTnFvXyavkNazNQTsjG4MqnU/p This is needed for the ARM NEON code to build. --- pngpriv.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pngpriv.h b/pngpriv.h index ebea8b8..9ebc510 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -194,8 +194,6 @@ # endif #endif -#include "png.h" - /* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */ #ifndef PNG_DLL_EXPORT # define PNG_DLL_EXPORT @@ -328,6 +326,7 @@ # define PNGFAPI /* PRIVATE */ #endif +#ifndef PNG_VERSION_INFO_ONLY /* Other defines specific to compilers can go here. Try to keep * them inside an appropriate ifdef/endif pair for portability. */ @@ -369,6 +368,7 @@ # include # endif #endif /* FLOATING_ARITHMETIC || FLOATING_POINT */ +#endif /* VERSION_INFO_ONLY */ /* These macros may need to be architecture dependent. */ #define PNG_ALIGN_NONE 0 /* do not use data alignment */ @@ -679,6 +679,7 @@ */ #ifndef PNG_VERSION_INFO_ONLY +#include "png.h" #include "pngstruct.h" #include "pnginfo.h"