diff options
| author | dim <dim@FreeBSD.org> | 2014-01-30 07:44:22 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-30 07:44:22 +0000 |
| commit | 0b319638e352dd16f2e5a243bd3826d37eef1680 (patch) | |
| tree | add3759d4df7ee10d814c3b2561c3c28fcd9cef2 /contrib/libc++/include/cstring | |
| parent | 9cecf9778c1472e916ad20086c11e4bf332ba6ad (diff) | |
| parent | c3e10da3dc0f616b78ccf85206fdcf4c92f8ac85 (diff) | |
| download | FreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.zip FreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.tar.gz | |
Import libc++ 3.4 release. This contains a lot of bugfixes, and some
preliminary support for C++1y.
MFC after: 3 weeks
Diffstat (limited to 'contrib/libc++/include/cstring')
| -rw-r--r-- | contrib/libc++/include/cstring | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libc++/include/cstring b/contrib/libc++/include/cstring index 45075b3..21c9155 100644 --- a/contrib/libc++/include/cstring +++ b/contrib/libc++/include/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__) && !defined(_STRING_H_CPLUSPLUS_98_CONFORMANCE_) +// 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);} |
