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: 108 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id 08B803600B0 for ; Mon, 17 Mar 2014 05:24:41 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id AA7591F5E22F; Mon, 17 Mar 2014 05:24:41 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 858A61F57C46 for ; Mon, 17 Mar 2014 05:24:41 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=OgXMdPGgVOnX6ZXtvV8kkXVIs6+A6C4 Rr1b9KJFCuyEcsZtDYwggR7JhI9uM8NMtAuLskHQA9229KmhDPrC9oa5UZEmaA1b 8UswAQxrbZ9cM+ence6WdgY3ivJw60Sd74+KVj0Ik7EwGm5HlWG+IXiIBLasclqB o6wGu0BQxbBk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=+pM3rogzJq33UAQfFan09Q6uQvg=; b=qXChh I27j+OmU4lLx+MpBl61H3Q0iU020/lrY2zcd4UwvkbtIyXWP3KzKAeufV/1/9O5J ZvZ6jqRWzLpcvalM+YgYMtozZ8c2jutFNhDudNSlW4cJgKd37ARVcIiX6KRJoq73 rMfdn3JYNFmcPZewnpXdS7GUdpVJM+JAG45Ub8= Received: (qmail 19223 invoked by alias); 17 Mar 2014 12:23:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk 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 Authentication-Results: sourceware.org; auth=none 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5Mln/TnZJyDLZNg0pn9ZRTSIPgpnjaIyHvPeYu01wYA=; b=TCePzA39D/Ml7iR5YXfA5IBfDsrDwybVSc/Okkt2vvFJQqLQY/ejxpPtZJEwrk/PU1 C2hAr6OqofgAsVvev+tGOjB0phPMX2dic3rPZoP65ECxkYMLqdbC/N+jbxjSsXMBQ+lG yPd4V6+PDIMOoW9tETByGetqCU6pWIzkXwcrd1kpXDQrxBJqZ2P4iZ+B0UkPKvqQz6XX 3dMb4MobawAinYvOdT3j7CGA/FdrHvc1QmP2c9mc/XzdDsldh3q9Np95ejNNAfzdJtNj fE+kukUoUXX/Kp0kgM8OkLYrzauX9759KNzzwxgQfB+zOAEqt0H55M+AC2Rb+z1VPHgu mAHg== X-Gm-Message-State: ALoCoQkk9zIDqJQ5yVBHSywkDPphwEnE2ql0FKywzbWebypPqPYK7gsaAHriBFx4+sj8fO12mAT8 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-DH-Original-To: glibc@patchwork.siddhesh.in 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