diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 19:57:52 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 19:57:52 -0700 |
| commit | 5bc9fceed3002e0b24a3510f12779fc1243c4c07 (patch) | |
| tree | 3ace3d12e614e27cece95fad1eef96bae0d52409 /system/include/libcxx/cstring | |
| parent | 6c275bebb45d6aac7e4a024b825ab34971b178d2 (diff) | |
| parent | 32b77e92823f0cd6837b85f3c6208715fb0e757b (diff) | |
Merge pull request #1480 from waywardmonkeys/update-libcxx-part-20
Update libcxx
Diffstat (limited to 'system/include/libcxx/cstring')
| -rw-r--r-- | system/include/libcxx/cstring | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/include/libcxx/cstring b/system/include/libcxx/cstring index 13bb1189..21c9155c 100644 --- a/system/include/libcxx/cstring +++ b/system/include/libcxx/cstring @@ -93,8 +93,8 @@ 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__) +// MSVCRT, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus +#if !defined(__GLIBC__) && !defined(_LIBCPP_MSVCRT) && !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);} |