summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-04-04 11:36:47 +0000
committerAlexey Samsonov <samsonov@google.com>2012-04-04 11:36:47 +0000
commitd01c51d33a5b4c52160c0a6cc18f7739a0a137d3 (patch)
tree0a9a3c8c2d94beb44a105b2a35988d013383e547
parentfa3eee4101f39661b4a88ac0bc7f184ca8c1ecb1 (diff)
downloadcompiler-rt-d01c51d33a5b4c52160c0a6cc18f7739a0a137d3.tar.gz
compiler-rt-d01c51d33a5b4c52160c0a6cc18f7739a0a137d3.tar.bz2
compiler-rt-d01c51d33a5b4c52160c0a6cc18f7739a0a137d3.tar.xz
[ASan] use correct C-version of strchr on Windows
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@154006 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/asan_interceptors.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc
index 7f10a741..0adb6997 100644
--- a/lib/asan/asan_interceptors.cc
+++ b/lib/asan/asan_interceptors.cc
@@ -67,11 +67,9 @@ int memcmp(const void *a1, const void *a2, size_t size);
void* memmove(void *to, const void *from, size_t size);
void* memcpy(void *to, const void *from, size_t size);
void* memset(void *block, int c, size_t size);
-# if defined(__APPLE__)
char* strchr(const char *str, int c);
+# if defined(__APPLE__)
char* index(const char *string, int c);
-# elif defined(_WIN32)
-char* strchr(const char *s, char c);
# endif
char* strcat(char *to, const char* from); // NOLINT
char* strcpy(char *to, const char* from); // NOLINT