aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-13 10:40:01 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-13 10:40:01 +0000
commit782a65056aeed8ed3b632deeeec6973986c751bf (patch)
treef14ced7887991e22b559606a6957851efe50865d /include
parentf107e6ca9bbfc82c980c3e8e5c6bf04261b49c90 (diff)
downloadexternal_llvm-782a65056aeed8ed3b632deeeec6973986c751bf.zip
external_llvm-782a65056aeed8ed3b632deeeec6973986c751bf.tar.gz
external_llvm-782a65056aeed8ed3b632deeeec6973986c751bf.tar.bz2
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
Diffstat (limited to 'include')
-rw-r--r--include/llvm/Config/llvm-config.h.cmake2
-rw-r--r--include/llvm/Support/Compiler.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index b2be7b4..eda17ee 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 92835fc..adc0ce2 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)