diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-04-08 18:59:28 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-04-08 18:59:28 +0000 |
| commit | 98381453c00de6773d01985062f3a2056044bfdc (patch) | |
| tree | e7153e565431c01047deea8a6154187afbb031ee /libcxx/include/cstring | |
| parent | 1dfc27d9c1b86fdd0a6146ac3a006b3df75fb6ce (diff) | |
| download | bcm5719-llvm-98381453c00de6773d01985062f3a2056044bfdc.tar.gz bcm5719-llvm-98381453c00de6773d01985062f3a2056044bfdc.zip | |
Change <cwchar> and <cstring> to look out for flags which may or may not be set by the C headers <wchar.h> and <string.h> indicating C support for the C++-altered wcschr, wcspbrk, wcsrchr, wcsstr, wmemchr, strchr, strpbrk, strrchr, memchr, and strstr. This was already done in <cstring> for other platforms using other flags, so just had to add one more flag to the list there.
llvm-svn: 179041
Diffstat (limited to 'libcxx/include/cstring')
| -rw-r--r-- | libcxx/include/cstring | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/cstring b/libcxx/include/cstring index 13bb11892dc..45075b3af29 100644 --- a/libcxx/include/cstring +++ b/libcxx/include/cstring @@ -94,7 +94,7 @@ using ::strspn; using ::strstr; // MSVC, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus -#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__) +#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__) && !defined(_STRING_H_CPLUSPLUS_98_CONFORMANCE_) 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);} |
