From: danno@chromium.org Date: Wed, 23 Oct 2013 13:50:01 +0000 (+0000) Subject: Fix MEMORY_SANITIZER macro redefinition error. X-Git-Tag: upstream/4.7.83~11986 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2208338b6e920010830b141da0b2124d9d1d26b5;p=platform%2Fupstream%2Fv8.git Fix MEMORY_SANITIZER macro redefinition error. MEMORY_SANITIZER is defined by default in certain compiler environments (when MemorySanitizer is enabled, of course). Do not redefine it in that case. R=danno@chromium.org Review URL: https://codereview.chromium.org/34503012 Patch from Evgeniy Stepanov . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17344 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/msan.h b/src/msan.h index 3bb746d..484c9fa 100644 --- a/src/msan.h +++ b/src/msan.h @@ -34,7 +34,7 @@ # define __has_feature(x) 0 #endif -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(MEMORY_SANITIZER) # define MEMORY_SANITIZER #endif