[llvm-commits] [compiler-rt] r152085 - /compiler-rt/trunk/lib/asan/asan_malloc_mac.cc

Eli Friedman eli.friedman at gmail.com
Mon Mar 5 17:21:14 PST 2012


Author: efriedma
Date: Mon Mar  5 19:21:14 2012
New Revision: 152085

URL: http://llvm.org/viewvc/llvm-project?rev=152085&view=rev
Log:
Make sure to properly ifdef out an unused function on OSX < 10.6.  PR12136.  Patch from Jeremy Huddleston.


Modified:
    compiler-rt/trunk/lib/asan/asan_malloc_mac.cc

Modified: compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_mac.cc?rev=152085&r1=152084&r2=152085&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_mac.cc Mon Mar  5 19:21:14 2012
@@ -298,10 +298,13 @@
 }
 #endif
 
+#if defined(MAC_OS_X_VERSION_10_6) && \
+    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 boolean_t mi_zone_locked(malloc_zone_t *zone) {
   // UNIMPLEMENTED();
   return false;
 }
+#endif
 
 }  // unnamed namespace
 





More information about the llvm-commits mailing list