<valgrind/valgrind.h>: Fix for Intel C/C++ compiler in MSVC compatibility mode.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12361
This commit is contained in:
Bart Van Assche 2012-01-31 10:13:51 +00:00
parent 6c474ee221
commit 6153849464

View File

@ -3701,7 +3701,7 @@ typedef
is the number of characters printed, excluding the "**<pid>** " part at the
start and the backtrace (if present). */
#if defined(__GNUC__) || defined(__INTEL_COMPILER)
#if defined(__GNUC__) || defined(__INTEL_COMPILER) && !defined(_MSC_VER)
/* Modern GCC will optimize the static routine out if unused,
and unused attribute will shut down warnings about it. */
static int VALGRIND_PRINTF(const char *format, ...)
@ -3741,7 +3741,7 @@ VALGRIND_PRINTF(const char *format, ...)
#endif /* NVALGRIND */
}
#if defined(__GNUC__) || defined(__INTEL_COMPILER)
#if defined(__GNUC__) || defined(__INTEL_COMPILER) && !defined(_MSC_VER)
static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
__attribute__((format(__printf__, 1, 2), __unused__));
#endif