[glib] glib/valgrind.h: Disable inline ASM on MSVC x64 builds

[Chun-wei Fan <fanchunwei src gnome org>]

commit bbcce75d4e09f74894684b18222170eef97e8b2c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 25 17:14:11 2018 +0800

    glib/valgrind.h: Disable inline ASM on MSVC x64 builds
    
    Visual Studio x64 builds do not allow inline assembly code, so we need
    to re-add the code that disables inline assembly when we build with
    Visual Studio for x64 builds, as we did before.  This is necessary when
    we update the included valgrind.h.

 glib/valgrind.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
---
diff --git a/glib/valgrind.h b/glib/valgrind.h
index 5aed0dfca..cddc38deb 100644
--- a/glib/valgrind.h
+++ b/glib/valgrind.h
@@ -171,6 +171,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 */