[llvm-commits] [compiler-rt] r161945 - in /compiler-rt/trunk/lib/asan: asan_mac.cc asan_mac.h

[Alexander Potapenko]

Author: glider
Date: Wed Aug 15 07:23:36 2012
New Revision: 161945

URL: http://llvm.org/viewvc/llvm-project?rev=161945&view=rev
Log:
Move the prototype of __CFInitialize to asan_mac.h so that asan_malloc_mac.cc may use it in the dynamic library mode.

Modified:
    compiler-rt/trunk/lib/asan/asan_mac.cc
    compiler-rt/trunk/lib/asan/asan_mac.h

Modified: compiler-rt/trunk/lib/asan/asan_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.cc?rev=161945&r1=161944&r2=161945&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_mac.cc Wed Aug 15 07:23:36 2012
@@ -404,8 +404,6 @@
 
 DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr)
 
-extern "C"
-void __CFInitialize();
 DECLARE_REAL_AND_INTERCEPTOR(void, __CFInitialize)
 
 namespace __asan {

Modified: compiler-rt/trunk/lib/asan/asan_mac.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.h?rev=161945&r1=161944&r2=161945&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mac.h (original)
+++ compiler-rt/trunk/lib/asan/asan_mac.h Wed Aug 15 07:23:36 2012
@@ -43,6 +43,9 @@
   MACOS_VERSION_LION
 };
 
+// Used by asan_malloc_mac.cc and asan_mac.cc
+extern "C" void __CFInitialize();
+
 namespace __asan {
 
 int GetMacosVersion();