This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 5/7] Fix __STRICT_ANSI__ -Wundef warnings
- From: Siddhesh Poyarekar <siddhesh dot poyarekar at gmail dot com>
- To: Will Newton <will dot newton at linaro dot org>
- Cc: GNU C Library <libc-alpha at sourceware dot org>
- Date: Mon, 17 Mar 2014 19:11:04 +0530
- Subject: Re: [PATCH 5/7] Fix __STRICT_ANSI__ -Wundef warnings
- Authentication-results: sourceware.org; auth=none
- References: <1395059004-20960-1-git-send-email-will dot newton at linaro dot org> <1395059004-20960-5-git-send-email-will dot newton at linaro dot org>
On 17 March 2014 17:53, Will Newton <will.newton@linaro.org> wrote:
> ChangeLog:
>
> 2014-03-17 Will Newton <will.newton@linaro.org>
>
> * 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
> --
> 1.8.1.4
>
The conditionals are technically different, but it shouldn't matter
since -ansi would do the right thing. Looks good to me.
Thanks,
Siddhesh
--
http://siddhesh.in