diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-10-22 20:59:45 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-10-22 20:59:45 +0000 |
| commit | e4383379aea7783e11f2229f27fa81b52751e4f4 (patch) | |
| tree | 4f369dabb74c0a9b6d1059d801b4e41607e2157d /libcxx/include/cstring | |
| parent | a6674c7fc965ef39b97d2faf518587e02cc23d56 (diff) | |
| download | bcm5719-llvm-e4383379aea7783e11f2229f27fa81b52751e4f4.tar.gz bcm5719-llvm-e4383379aea7783e11f2229f27fa81b52751e4f4.zip | |
More windows port work by Ruben Van Boxem
llvm-svn: 142732
Diffstat (limited to 'libcxx/include/cstring')
| -rw-r--r-- | libcxx/include/cstring | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/include/cstring b/libcxx/include/cstring index 1a230559bd2..dd49d802d5e 100644 --- a/libcxx/include/cstring +++ b/libcxx/include/cstring @@ -93,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) 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);} |
