valgrind.h: Disable Valgrind features on x64 Visual C++ Builds

...so that builds of GLib on x64 Visual C++ can be restored, as the build
fails in line 449 of valgrind.h as it only supports MinGW/GCC for x64
Windows and simply will not build otherwise.  Make the x64 Visual C++
builds compile again by defining NVALGRIND when GLib is being built for
Windows on x64 Visual C++.

https://bugzilla.gnome.org/show_bug.cgi?id=732465

diff --git a/glib/valgrind.h b/glib/valgrind.h
index a4380d134c979dfe00d5ef17b85d6ee34695dad8..bebfd69aa5a9fbda6606f991e699df10ff393f4d 100644 (file)
--- a/glib/valgrind.h
+++ b/glib/valgrind.h
@@ -160,6 +160,16 @@
 #  endif
 #endif
 
+/* XXX: Unfortunately x64 Visual C++ does not suport inline asms,
+ * 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 */