aboutsummaryrefslogtreecommitdiff
path: root/system/include/libcxx/cstring
diff options
context:
space:
mode:
Diffstat (limited to 'system/include/libcxx/cstring')
-rw-r--r--system/include/libcxx/cstring5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/include/libcxx/cstring b/system/include/libcxx/cstring
index 6d2e507c..13bb1189 100644
--- a/system/include/libcxx/cstring
+++ b/system/include/libcxx/cstring
@@ -60,7 +60,9 @@ size_t strlen(const char* s);
#include <__config>
#include <string.h>
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
+#endif
_LIBCPP_BEGIN_NAMESPACE_STD
@@ -91,7 +93,8 @@ using ::strspn;
using ::strstr;
-#ifndef __GLIBC__ // GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus
+// MSVC, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus
+#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__)
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);}