[llvm] r175050 - Fix MSan annotations inclusion guard.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Feb 13 04:40:01 2013
New Revision: 175050

URL: http://llvm.org/viewvc/llvm-project?rev=175050&view=rev
Log:
Fix MSan annotations inclusion guard.

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

Modified:
    llvm/trunk/include/llvm/Config/llvm-config.h.cmake
    llvm/trunk/include/llvm/Support/Compiler.h

Modified: llvm/trunk/include/llvm/Config/llvm-config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.cmake?rev=175050&r1=175049&r2=175050&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Config/llvm-config.h.cmake (original)
+++ llvm/trunk/include/llvm/Config/llvm-config.h.cmake Wed Feb 13 04:40:01 2013
@@ -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

Modified: llvm/trunk/include/llvm/Support/Compiler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=175050&r1=175049&r2=175050&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Compiler.h (original)
+++ llvm/trunk/include/llvm/Support/Compiler.h Wed Feb 13 04:40:01 2013
@@ -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)