diff options
| author | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-07-26 16:50:11 +0400 |
|---|---|---|
| committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-09-03 16:20:52 +0400 |
| commit | 3c4b50fd8cce143d9ba8f03a93f0fccba4e54d14 (patch) | |
| tree | f1db656c0c18b55cdbb471f413c05701a4e055b8 /libc/include/string.h | |
| parent | 99b859cf786f208300f7fc3a6fa5b570c3333433 (diff) | |
| download | bionic-3c4b50fd8cce143d9ba8f03a93f0fccba4e54d14.zip bionic-3c4b50fd8cce143d9ba8f03a93f0fccba4e54d14.tar.gz bionic-3c4b50fd8cce143d9ba8f03a93f0fccba4e54d14.tar.bz2 | |
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 <pavel.v.chupin@intel.com>
Diffstat (limited to 'libc/include/string.h')
| -rw-r--r-- | libc/include/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |