From 3c80c6c574850106481f82b9e23d1c728458d4a9 Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Tue, 13 Aug 2013 11:42:45 +0000 Subject: Define SANITIZER_INTERFACE_ATTRIBUTE on Windows and fix all the places where SANITIZER_INTERFACE_ATTRIBUTE or SANITIZER_ATTRIBUTE_WEAK are used git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@188261 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/msan/msan_interface_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/msan/msan_interface_internal.h') diff --git a/lib/msan/msan_interface_internal.h b/lib/msan/msan_interface_internal.h index 5d643e862..c8f51138d 100644 --- a/lib/msan/msan_interface_internal.h +++ b/lib/msan/msan_interface_internal.h @@ -88,7 +88,7 @@ void __msan_set_keep_going(int keep_going); SANITIZER_INTERFACE_ATTRIBUTE int __msan_set_poison_in_malloc(int do_poison); -SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE /* OPTIONAL */ const char* __msan_default_options(); // For testing. @@ -163,10 +163,10 @@ uptr __msan_get_free_bytes(); SANITIZER_INTERFACE_ATTRIBUTE uptr __msan_get_unmapped_bytes(); -SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE /* OPTIONAL */ void __msan_malloc_hook(void *ptr, uptr size); -SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE /* OPTIONAL */ void __msan_free_hook(void *ptr); } // extern "C" -- cgit v1.2.3