diff options
author | Howard Hinnant <hhinnant@apple.com> | 2010-10-14 17:11:39 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2010-10-14 17:11:39 +0000 |
commit | 8177207f3cd64f4f4d0042132ed9041f6086e67c (patch) | |
tree | 0d6515a290d9f20cb5dc09552f51d68f5a8d6feb | |
parent | f9734c831f63b160d1e64f3af2ebacfef7d4ed12 (diff) | |
download | external_libcxx-8177207f3cd64f4f4d0042132ed9041f6086e67c.tar.gz external_libcxx-8177207f3cd64f4f4d0042132ed9041f6086e67c.tar.bz2 external_libcxx-8177207f3cd64f4f4d0042132ed9041f6086e67c.zip |
Bug 7983 fixed by Bernhard Rosenkraenzer
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@116487 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/cstring | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/cstring b/include/cstring index 06521d1e6..6d2e507c4 100644 --- a/include/cstring +++ b/include/cstring @@ -78,23 +78,26 @@ using ::strcoll; using ::strxfrm; using ::memchr; -inline _LIBCPP_INLINE_VISIBILITY void* memchr( void* __s, int __c, size_t __n) {return ::memchr(__s, __c, __n);} using ::strchr; -inline _LIBCPP_INLINE_VISIBILITY char* strchr( char* __s, int __c) {return ::strchr(__s, __c);} using ::strcspn; using ::strpbrk; -inline _LIBCPP_INLINE_VISIBILITY char* strpbrk( char* __s1, const char* __s2) {return ::strpbrk(__s1, __s2);} using ::strrchr; -inline _LIBCPP_INLINE_VISIBILITY char* strrchr( char* __s, int __c) {return ::strrchr(__s, __c);} using ::strspn; using ::strstr; + +#ifndef __GLIBC__ // GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus +inline _LIBCPP_INLINE_VISIBILITY char* strchr( char* __s, int __c) {return ::strchr(__s, __c);} +inline _LIBCPP_INLINE_VISIBILITY char* strpbrk( char* __s1, const char* __s2) {return ::strpbrk(__s1, __s2);} +inline _LIBCPP_INLINE_VISIBILITY char* strrchr( char* __s, int __c) {return ::strrchr(__s, __c);} +inline _LIBCPP_INLINE_VISIBILITY void* memchr( void* __s, int __c, size_t __n) {return ::memchr(__s, __c, __n);} inline _LIBCPP_INLINE_VISIBILITY char* strstr( char* __s1, const char* __s2) {return ::strstr(__s1, __s2);} +#endif using ::strtok; using ::memset; |