[glib] valgrind.h: Disable Valgrind features on x64 Visual C++ Builds
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] valgrind.h: Disable Valgrind features on x64 Visual C++ Builds
- Date: Mon, 30 Jun 2014 11:58:05 +0000 (UTC)
commit 72de983469ce1db81134ed3b5e2af77b56170bf3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jun 30 17:31:57 2014 +0800
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
glib/valgrind.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/glib/valgrind.h b/glib/valgrind.h
index a4380d1..bebfd69 100644
--- 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]