diff options
author | Dan Albert <danalbert@google.com> | 2014-06-04 08:53:33 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-06-05 11:05:10 -0700 |
commit | 40fca0f08b1eb87e283d6f634d9759ed3161f517 (patch) | |
tree | 22a02418b0c225b4e994d8625970c3affe900eda | |
parent | 431aa4dc9282e23231ba9243f43fd3d49b5f88b3 (diff) | |
download | bionic-40fca0f08b1eb87e283d6f634d9759ed3161f517.zip bionic-40fca0f08b1eb87e283d6f634d9759ed3161f517.tar.gz bionic-40fca0f08b1eb87e283d6f634d9759ed3161f517.tar.bz2 |
Removes index() from bionic.
This function has been removed from POSIX.
Unfortunately, we can't leave #define index(a, b) strchr((a), (b)) in its place
because defining a preprocessor macro for index() breaks a whole lot of code.
Bug: 13935372
Change-Id: Ifda348acde06da61c12e7ee2f8fe6950a3174dd1
-rw-r--r-- | libc/arch-arm64/arm64.mk | 1 | ||||
-rw-r--r-- | libc/arch-mips64/mips64.mk | 1 | ||||
-rw-r--r-- | libc/arch-x86_64/x86_64.mk | 1 | ||||
-rw-r--r-- | libc/include/string.h | 1 | ||||
-rw-r--r-- | libc/include/strings.h | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk index 62974b6..223bc74 100644 --- a/libc/arch-arm64/arm64.mk +++ b/libc/arch-arm64/arm64.mk @@ -1,7 +1,6 @@ # arm64 specific configs libc_common_src_files_arm64 := \ - bionic/index.cpp \ bionic/memchr.c \ bionic/__memcmp16.cpp \ bionic/memrchr.c \ diff --git a/libc/arch-mips64/mips64.mk b/libc/arch-mips64/mips64.mk index 9a24c61..2b18042 100644 --- a/libc/arch-mips64/mips64.mk +++ b/libc/arch-mips64/mips64.mk @@ -1,7 +1,6 @@ # mips64 specific configs libc_common_src_files_mips64 := \ - bionic/index.cpp \ bionic/memchr.c \ bionic/memcmp.c \ bionic/memmove.c \ diff --git a/libc/arch-x86_64/x86_64.mk b/libc/arch-x86_64/x86_64.mk index 2f0cf2d..bd5e9c1 100644 --- a/libc/arch-x86_64/x86_64.mk +++ b/libc/arch-x86_64/x86_64.mk @@ -1,7 +1,6 @@ # x86_64 specific configs libc_common_src_files_x86_64 := \ - bionic/index.cpp \ bionic/memchr.c \ bionic/memrchr.c \ bionic/strchr.cpp \ diff --git a/libc/include/string.h b/libc/include/string.h index c9ae03b..7727c0e 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -43,7 +43,6 @@ extern void* memmove(void *, const void *, size_t); extern void* memset(void *, int, size_t); extern void* memmem(const void *, size_t, const void *, size_t) __purefunc; -extern char* index(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc; extern char* __strchr_chk(const char *, int, size_t); diff --git a/libc/include/strings.h b/libc/include/strings.h index 8f5fec5..c4d5f6c 100644 --- a/libc/include/strings.h +++ b/libc/include/strings.h @@ -47,7 +47,6 @@ __BEGIN_DECLS #define bzero(b, len) (void)(memset((b), '\0', (len))) int ffs(int); -char *index(const char *, int); int strcasecmp(const char *, const char *); int strncasecmp(const char *, const char *, size_t); |