From 815a6cc1e325a4e8596b91756039a7d699471b11 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 27 Apr 2013 22:47:52 +0000 Subject: Merge libc++ trunk r180598. Contains several minor cleanups and bug fixes, no major changes. MFC after: 2 weeks --- contrib/libc++/include/cstring | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/libc++/include/cstring') diff --git a/contrib/libc++/include/cstring b/contrib/libc++/include/cstring index 13bb118..45075b3 100644 --- a/contrib/libc++/include/cstring +++ b/contrib/libc++/include/cstring @@ -94,7 +94,7 @@ using ::strspn; using ::strstr; // MSVC, GNU libc and its derivates already have the correct prototype in #ifdef __cplusplus -#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__) +#if !defined(__GLIBC__) && !defined(_MSC_VER) && !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);} -- cgit v1.1