[llvm-commits] [compiler-rt] r150374 - /compiler-rt/trunk/lib/asan/asan_interceptors.cc
Evgeniy Stepanov
eugeni.stepanov at gmail.com
Mon Feb 13 04:12:33 PST 2012
Author: eugenis
Date: Mon Feb 13 06:12:32 2012
New Revision: 150374
URL: http://llvm.org/viewvc/llvm-project?rev=150374&view=rev
Log:
[asan] Return type of index() is char*.
This is important for Android, where we can't keep system headers
from leaking into asan_interceptors.cc.
Modified:
compiler-rt/trunk/lib/asan/asan_interceptors.cc
Modified: compiler-rt/trunk/lib/asan/asan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=150374&r1=150373&r2=150374&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Mon Feb 13 06:12:32 2012
@@ -377,10 +377,10 @@
}
#ifdef __linux__
-INTERCEPTOR(void*, index, const char *string, int c)
+INTERCEPTOR(char*, index, const char *string, int c)
ALIAS(WRAPPER_NAME(strchr));
#else
-DEFINE_REAL(void*, index, const char *string, int c);
+DEFINE_REAL(char*, index, const char *string, int c);
#endif
#ifdef ANDROID
More information about the llvm-commits
mailing list