[llvm-commits] [compiler-rt] r163692 - in /compiler-rt/trunk/lib: asan/asan_malloc_linux.cc interception/interception.h

[Alexey Samsonov]

Author: samsonov
Date: Wed Sep 12 04:42:23 2012
New Revision: 163692

URL: http://llvm.org/viewvc/llvm-project?rev=163692&view=rev
Log:
[ASan] fix interception macro for Android build

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

Modified: compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=163692&r1=163691&r2=163692&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_linux.cc Wed Sep 12 04:42:23 2012
@@ -21,11 +21,11 @@
 #include "asan_stack.h"
 
 #if ASAN_ANDROID
-DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size);
-DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr);
-DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size);
-DECLARE_REAL_AND_INTERCEPTOR(void*, realloc, void *ptr, uptr size);
-DECLARE_REAL_AND_INTERCEPTOR(void*, memalign, uptr boundary, uptr size);
+DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size)
+DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr)
+DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size)
+DECLARE_REAL_AND_INTERCEPTOR(void*, realloc, void *ptr, uptr size)
+DECLARE_REAL_AND_INTERCEPTOR(void*, memalign, uptr boundary, uptr size)
 
 struct MallocDebug {
   void* (*malloc)(uptr bytes);

Modified: compiler-rt/trunk/lib/interception/interception.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception.h?rev=163692&r1=163691&r2=163692&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception.h (original)
+++ compiler-rt/trunk/lib/interception/interception.h Wed Sep 12 04:42:23 2012
@@ -128,7 +128,7 @@
 #endif  // MAC_INTERPOSE_FUNCTIONS
 
 #define DECLARE_REAL_AND_INTERCEPTOR(ret_type, func, ...) \
-  DECLARE_REAL(ret_type, func, ##__VA_ARGS__) \
+  DECLARE_REAL(ret_type, func, __VA_ARGS__) \
   extern "C" ret_type WRAP(func)(__VA_ARGS__);
 
 // Generally, you don't need to use DEFINE_REAL by itself, as INTERCEPTOR