diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-08-15 16:51:29 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-15 16:51:29 -0700 |
| commit | 41e7af7eeb7f0d0a3991abd7ff87177308570c54 (patch) | |
| tree | 3c0684b6549c0e186032ca38252bc40fc4657273 /system/include/libcxx/cstring | |
| parent | b1eaf55eefb815e8f3556b59ce64e6d1e0f55d55 (diff) | |
| parent | 2e229a560955c07d1b66db27913af3284baa64fb (diff) | |
Merge branch 'incoming'
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);} |