diff options
| author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-02-17 14:29:14 +0700 |
|---|---|---|
| committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-03-25 00:34:11 +0700 |
| commit | 59ff5a6a3c3e1f5255c5cf29f98df633a77b89b3 (patch) | |
| tree | c7660fa62600366e3479dbf6b2fd1d25709af1b5 /system/include/libcxx/cstring | |
| parent | 80fd6f0bce2b95db6ec539c9275ce24585550e7c (diff) | |
Update to current libcxx.
This doesn't work yet as it needs to be customized for use with
emscripten still.
Diffstat (limited to 'system/include/libcxx/cstring')
| -rw-r--r-- | system/include/libcxx/cstring | 5 |
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);} |