From patchwork Mon Mar 17 12:23:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 26354 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7794C202FA for ; Mon, 17 Mar 2014 12:24:54 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rp16sf14092345pbb.5 for ; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=5Mln/TnZJyDLZNg0pn9ZRTSIPgpnjaIyHvPeYu01wYA=; b=jEa5W1wowyAF2ak9RQtvq+kLtJYrp82BZpunkv3z4sbGhX+RKXcka8bLfhx2Z4rMqH fSeh0r/Cf4/VQvxiP9EKwnbr47hJwI3WU1hNI9mNESVrCB+fAF14x8cpSwKKmWPKusyw miK45r2TgJxiG+BtfV6uVZQyAYq3jvcEMhH2g2GWv7c11IH1vEb7zYtRBxrMepFQSnNq XXIHZF6rFEUk6T52XNJLvdLnvL/2wDL+9rmTIZPkMQe40b1YCSsAzcAWoKNDYww1L8nx +lVWBaQHvYil6Muv7Mhu94D9kFhmWca67Mnysa1zGVeaP82LOxDpFiidBu0F0eUSHHHE 2fcQ== X-Gm-Message-State: ALoCoQmMObS6O8gfEFI2/nYugp7DoxSClGYUNRzgCgqEt6eQXs7LNyyPHCZxrwVuwDiZpSpMiaTm X-Received: by 10.66.141.135 with SMTP id ro7mr9031001pab.28.1395059093519; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.9 with SMTP id k9ls757552qgk.20.gmail; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) X-Received: by 10.220.191.134 with SMTP id dm6mr19914126vcb.16.1395059093380; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) Received: from mail-vc0-x22c.google.com (mail-vc0-x22c.google.com [2607:f8b0:400c:c03::22c]) by mx.google.com with ESMTPS id pd4si2748554veb.213.2014.03.17.05.24.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 05:24:53 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::22c; Received: by mail-vc0-f172.google.com with SMTP id la4so5729137vcb.3 for ; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) X-Received: by 10.220.11.141 with SMTP id t13mr321689vct.30.1395059093293; Mon, 17 Mar 2014 05:24:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp123213vck; Mon, 17 Mar 2014 05:24:52 -0700 (PDT) X-Received: by 10.68.102.34 with SMTP id fl2mr26066162pbb.2.1395059092487; Mon, 17 Mar 2014 05:24:52 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id uk5si8963190pab.109.2014.03.17.05.24.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 05:24:52 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-48214-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 19223 invoked by alias); 17 Mar 2014 12:23:42 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Subscribe: List-Archive: List-Post: , List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18956 invoked by uid 89); 17 Mar 2014 12:23:40 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f51.google.com X-Received: by 10.180.189.43 with SMTP id gf11mr9213838wic.32.1395059014806; Mon, 17 Mar 2014 05:23:34 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 5/7] Fix __STRICT_ANSI__ -Wundef warnings Date: Mon, 17 Mar 2014 12:23:22 +0000 Message-Id: <1395059004-20960-5-git-send-email-will.newton@linaro.org> In-Reply-To: <1395059004-20960-1-git-send-email-will.newton@linaro.org> References: <1395059004-20960-1-git-send-email-will.newton@linaro.org> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 ChangeLog: 2014-03-17 Will Newton * argp/argp-fmtstream.h: Check whether __STRICT_ANSI__ is defined with #ifdef rather than #if. * argp/argp.h: Likewise. --- argp/argp-fmtstream.h | 6 ++++-- argp/argp.h | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h index a5a1019..1ed2834 100644 --- a/argp/argp-fmtstream.h +++ b/argp/argp-fmtstream.h @@ -31,12 +31,14 @@ #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \ + defined __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif /* The __-protected variants of `format' and `printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \ + defined __STRICT_ANSI__ # define __format__ format # define __printf__ printf # endif diff --git a/argp/argp.h b/argp/argp.h index 3845172..0868228 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -37,12 +37,14 @@ #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \ + defined __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif /* The __-protected variants of `format' and `printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \ + defined __STRICT_ANSI__ # define __format__ format # define __printf__ printf # endif