From 3c4b50fd8cce143d9ba8f03a93f0fccba4e54d14 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Fri, 26 Jul 2013 16:50:11 +0400 Subject: Fix strchr for basic non-sse case on x86 Fix source location. Move declaration of __strchr_chk out of ifdef __BIONIC_FORTIFY which should be available for strchr.cpp compilation when __BIONIC_FORTIFY is not defined. Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7 Signed-off-by: Pavel Chupin --- libc/include/string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/include') diff --git a/libc/include/string.h b/libc/include/string.h index f6b4acf..10ff722 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -46,6 +46,8 @@ extern void memswap(void *, void *, size_t); extern char* index(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc; +extern char* __strchr_chk(const char *, int, size_t); + extern char* strrchr(const char *, int) __purefunc; extern size_t strlen(const char *) __purefunc; @@ -238,8 +240,6 @@ size_t strlen(const char *s) { return __strlen_chk(s, bos); } -extern char* __strchr_chk(const char *, int, size_t); - __BIONIC_FORTIFY_INLINE char* strchr(const char *s, int c) { size_t bos = __bos(s); -- cgit v1.1