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

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12361

diff --git a/include/valgrind.h b/include/valgrind.h
index 222a58e156323c6c183db5856690d6fea8d55a09..1bfed3a2583e54b8fbb4d7f49e50d0725dfad3b4 100644 (file)
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -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