From: Thomas Miletich Date: Mon, 28 Mar 2011 12:43:31 +0000 (+0200) Subject: [linux] Avoid unused-but-set variable warning in gcc 4.6 X-Git-Tag: v1.20.1~2182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914dc6bfa987ec92feca039b1db1533aa473b2f1;p=thirdparty%2Fipxe.git [linux] Avoid unused-but-set variable warning in gcc 4.6 Temporary modification to prevent valgrind.h from breaking compilation with gcc 4.6. When this problem is fixed upstream, a new and unmodified copy of valgrind.h should be imported. Signed-off-by: Thomas Miletich Signed-off-by: Michael Brown --- diff --git a/src/arch/x86/include/valgrind/valgrind.h b/src/arch/x86/include/valgrind/valgrind.h index 0f5b37662..d72754b05 100644 --- a/src/arch/x86/include/valgrind/valgrind.h +++ b/src/arch/x86/include/valgrind/valgrind.h @@ -4407,7 +4407,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) Ignored if addr == 0. */ #define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed) \ - {unsigned int _qzz_res; \ + {unsigned int __unused _qzz_res; \ VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ VG_USERREQ__MALLOCLIKE_BLOCK, \ addr, sizeB, rzB, is_zeroed, 0); \ @@ -4417,7 +4417,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) Ignored if addr == 0. */ #define VALGRIND_FREELIKE_BLOCK(addr, rzB) \ - {unsigned int _qzz_res; \ + {unsigned int __unused _qzz_res; \ VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ VG_USERREQ__FREELIKE_BLOCK, \ addr, rzB, 0, 0, 0); \