diff options
| author | Alexis Hunt <alercah@gmail.com> | 2011-07-09 01:09:31 +0000 |
|---|---|---|
| committer | Alexis Hunt <alercah@gmail.com> | 2011-07-09 01:09:31 +0000 |
| commit | f023519770be3f94900c0d7e75cf89c7a63b8859 (patch) | |
| tree | bf400aa7bf1a9437115323ba06c988cd499d4ece /libcxx/include | |
| parent | 780db902f70f3085832348f16efd7f2a2afa5dd5 (diff) | |
| download | bcm5719-llvm-f023519770be3f94900c0d7e75cf89c7a63b8859.tar.gz bcm5719-llvm-f023519770be3f94900c0d7e75cf89c7a63b8859.zip | |
Conditionally wrap the changes from r134781.
llvm-svn: 134783
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 4 | ||||
| -rw-r--r-- | libcxx/include/__locale | 2 | ||||
| -rw-r--r-- | libcxx/include/locale | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index b1385100e6c..239f0a22ce4 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -285,4 +285,8 @@ template <unsigned> struct __static_assert_check {}; #define __has_feature(__x) 0 #endif +#ifdef __APPLE__ +#define _LIBCPP_STABLE_APPLE_ABI +#endif + #endif // _LIBCPP_CONFIG diff --git a/libcxx/include/__locale b/libcxx/include/__locale index 521da04926c..3f669d61042 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -541,8 +541,10 @@ public: #endif _LIBCPP_ALWAYS_INLINE const mask* table() const _NOEXCEPT {return __tab_;} static const mask* classic_table() _NOEXCEPT; +#ifndef _LIBCPP_STABLE_APPLE_ABI static const int* __classic_upper_table() _NOEXCEPT; static const int* __classic_lower_table() _NOEXCEPT; +#endif protected: ~ctype(); diff --git a/libcxx/include/locale b/libcxx/include/locale index 4a65eb6bec8..778d6c6f902 100644 --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -192,8 +192,10 @@ template <class charT> class messages_byname; _LIBCPP_BEGIN_NAMESPACE_STD +#ifndef _LIBCPP_STABLE_APPLE_ABI // Get the C locale object locale_t __cloc(); +#endif // OSX has nice foo_l() functions that let you turn off use of the global // locale. Linux, not so much. The following functions avoid the locale when |
