Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/llvm/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2012-02-29 17:05:08 +0400
committerDavid Chisnall <csdavec@swan.ac.uk>2012-02-29 17:05:08 +0400
commit14c25b80e9be5aab9b503a53f810c5bbffe4d632 (patch)
tree199ca992efe98f7ab5e558763404fe70f488dd1c /libcxx/include/cstring
parent66d45737860948d34b3f7e46d6d571a9de6cb22c (diff)
Solaris port. Currently sees around 200 test failures, mostly related to
Solaris not providing some of the locales that the test suite uses. Note: This depends on an xlocale (partial) implementation for Solaris and a couple of fixed standard headers. These will be committed to a branch later today. llvm-svn: 151720
Diffstat (limited to 'libcxx/include/cstring')
-rw-r--r--libcxx/include/cstring2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/cstring b/libcxx/include/cstring
index dd49d802d5e0..13bb11892dc3 100644
--- a/libcxx/include/cstring
+++ b/libcxx/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);}