From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Wed, 13 Feb 2013 10:40:01 +0000 (+0000)
Subject: Fix MSan annotations inclusion guard.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=782a65056aeed8ed3b632deeeec6973986c751bf;p=oota-llvm.git

Fix MSan annotations inclusion guard.

#cmakedefine does not behave the way I though it was.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175050 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index b2be7b4f072..eda17ee4a62 100644
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -125,6 +125,6 @@
 #cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}
 
 /* Define to 1 if you have the <sanitizer/msan_interface.h> header file. */
-#cmakedefine LLVM_HAVE_MSAN_ANNOTATIONS ${HAVE_SANITIZER_MSAN_INTERFACE_H}
+#cmakedefine HAVE_SANITIZER_MSAN_INTERFACE_H ${HAVE_SANITIZER_MSAN_INTERFACE_H}
 
 #endif
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index 92835fce542..adc0ce2ab14 100644
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -305,7 +305,7 @@
 # define LLVM_FUNCTION_NAME __func__
 #endif
 
-#if defined(LLVM_HAVE_MSAN_ANNOTATIONS)
+#if defined(HAVE_SANITIZER_MSAN_INTERFACE_H)
 # include <sanitizer/msan_interface.h>
 #else
 # define __msan_allocated_memory(p, size)