Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(371)

Unified Diff: src/core/model/valgrind.h

Issue 342120043: New patch for core module changes (Closed)
Patch Set: Updated core patch Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/core/model/valgrind.h
===================================================================
--- a/src/core/model/valgrind.h
+++ b/src/core/model/valgrind.h
@@ -159,6 +159,16 @@
#endif
+/* XXX: Unfortunately x64 Visual C++ does not suport inline asms,
Peter Barnes 2018/05/23 19:45:42 This should be defined by the build system, when n
+ * so disable the use of valgrind's inline asm's for x64 Visual C++
+ * builds, so that x64 Visual C++ builds of GLib can be maintained
+ */
+#if defined (PLAT_amd64_win64) && defined (_MSC_VER)
+# if !defined(NVALGRIND)
+# define NVALGRIND 1
+# endif
+#endif
+
/* ------------------------------------------------------------------ */
/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS. There is nothing */
/* in here of use to end-users -- skip to the next section. */
@@ -5265,7 +5275,8 @@
VALGRIND_PRINTF(const char *format, ...)
{
#if defined(NVALGRIND)
- return 0;
+ (void)format; // make compiler happy
Peter Barnes 2018/05/23 19:45:41 Don't modify upstream file. Need to find another
+ return 0;
#else /* NVALGRIND */
#if defined(_MSC_VER) || defined(__MINGW64__)
uintptr_t _qzz_res;
@@ -5303,7 +5314,8 @@
VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
{
#if defined(NVALGRIND)
- return 0;
+ (void)format; // make compiler happy
Peter Barnes 2018/05/23 19:45:42 Don't modify upstream file. Need to find another
+ return 0;
#else /* NVALGRIND */
#if defined(_MSC_VER) || defined(__MINGW64__)
uintptr_t _qzz_res;

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b