diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-02-13 12:12:32 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-02-13 12:12:32 +0000 |
| commit | b25d0d2318ba6dea1869d12b532f8e80b3a7a772 (patch) | |
| tree | fbc2d046716cb43e91cfc1179d96197044a8b9cb | |
| parent | da7522b55130357d156be927447c96dcc2c2c963 (diff) | |
| download | bcm5719-llvm-b25d0d2318ba6dea1869d12b532f8e80b3a7a772.tar.gz bcm5719-llvm-b25d0d2318ba6dea1869d12b532f8e80b3a7a772.zip | |
[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.
llvm-svn: 150374
| -rw-r--r-- | compiler-rt/lib/asan/asan_interceptors.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_interceptors.cc b/compiler-rt/lib/asan/asan_interceptors.cc index 5c106acb321..b2d437590e9 100644 --- a/compiler-rt/lib/asan/asan_interceptors.cc +++ b/compiler-rt/lib/asan/asan_interceptors.cc @@ -377,10 +377,10 @@ INTERCEPTOR(char*, strchr, const char *str, int c) { } #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 |
