summaryrefslogtreecommitdiffstats
path: root/include/cstring
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2012-03-13 14:09:15 +0000
committertheraven <theraven@FreeBSD.org>2012-03-13 14:09:15 +0000
commitbaa75b9984d33ea49ffb76a73507b64d879166cc (patch)
tree491848d33dbdf1751fd52f321d3fbf70a8e616f2 /include/cstring
parentd8f28ec8a2faabad3aabb9f7a26755971424ef05 (diff)
downloadFreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.zip
FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.tar.gz
Import new version of libc++ into vendor branch.
Approved by: dim (mentor)
Diffstat (limited to 'include/cstring')
-rw-r--r--include/cstring2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/cstring b/include/cstring
index dd49d80..13bb118 100644
--- a/include/cstring
+++ b/include/cstring
@@ -94,7 +94,7 @@ 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)
+#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);}
OpenPOWER on IntegriCloud