|
From: <sv...@va...> - 2012-01-31 10:18:34
|
Author: bart
Date: 2012-01-31 10:13:51 +0000 (Tue, 31 Jan 2012)
New Revision: 12361
Log:
<valgrind/valgrind.h>: Fix for Intel C/C++ compiler in MSVC compatibility mode.
Modified:
trunk/include/valgrind.h
Modified: trunk/include/valgrind.h
===================================================================
--- trunk/include/valgrind.h 2012-01-30 15:07:20 UTC (rev 12360)
+++ trunk/include/valgrind.h 2012-01-31 10:13:51 UTC (rev 12361)
@@ -3701,7 +3701,7 @@
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 @@
#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
|