From 1f8fbdc736500bb3f7278838adf552916954b536 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 17 May 2008 02:35:22 +0200 Subject: [PATCH] Avoid some warnings from "gcc -Wshadow". --- ChangeLog | 6 ++++++ lib/vasnprintf.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 581337f45..7c0a840fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-16 Jim Meyering + Bruno Haible + + Avoid some warnings from "gcc -Wshadow". + * lib/vasnprintf.c (exp, remainder): Define to different identifiers. + 2008-05-15 Eric Blake Extend previous patch to cygwin 1.7.0. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 517888cf0..66ce42057 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -200,6 +200,13 @@ local_wcslen (const wchar_t *s) /* Here we need to call the native sprintf, not rpl_sprintf. */ #undef sprintf +/* Avoid some warnings from "gcc -Wshadow". + This file doesn't use the exp() and remainder() functions. */ +#undef exp +#define exp expo +#undef remainder +#define remainder rem + #if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL /* Determine the decimal-point character according to the current locale. */ # ifndef decimal_point_char_defined -- 2.11.0