From 0d0c2e1ca648461bb803f9feb42d9a5aa30a7ef0 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 25 Aug 2015 00:37:55 +0200
Subject: Core/Misc: Fixed macro redefinition warnings when building for
 running under helgrind

(cherry picked from commit ec5700c2a25e64842a9d3f81b48535b349a9d466)
---
 src/common/Define.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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
-- 
cgit v1.2.3