aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-08-25 00:37:55 +0200
committerjackpoz <giacomopoz@gmail.com>2015-09-27 13:57:15 +0200
commit0d0c2e1ca648461bb803f9feb42d9a5aa30a7ef0 (patch)
tree6bc84b1376c2a35e9cd0deacd60b5889291cfdc0 /src
parent12f5c766c92d8d9008eaffea9b7133e148362026 (diff)
Core/Misc: Fixed macro redefinition warnings when building for running under helgrind
(cherry picked from commit ec5700c2a25e64842a9d3f81b48535b349a9d466)
Diffstat (limited to 'src')
-rw-r--r--src/common/Define.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/Define.h b/src/common/Define.h
index 97e07cef8b3..7332bdc4cff 100644
--- a/src/common/Define.h
+++ b/src/common/Define.h
@@ -33,6 +33,8 @@
# endif
# if defined(HELGRIND)
# include <valgrind/helgrind.h>
+# undef _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE
+# undef _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER
# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A) ANNOTATE_HAPPENS_BEFORE(A)
# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) ANNOTATE_HAPPENS_AFTER(A)
# endif