diff options
| author | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 20:34:23 +0000 |
|---|---|---|
| committer | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 20:34:23 +0000 |
| commit | a409d59cf5847b1296fc881887bc219abc3f6a32 (patch) | |
| tree | 1c1bcab874898a2514eb940942162476d0fb379b /libcxx/src | |
| parent | 3f7a24e4007d4689a3602c4c5425bb2e27915530 (diff) | |
| download | bcm5719-llvm-a409d59cf5847b1296fc881887bc219abc3f6a32.tar.gz bcm5719-llvm-a409d59cf5847b1296fc881887bc219abc3f6a32.zip | |
Newlib names ELAST differently than linux
llvm-svn: 216943
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/ios.cpp | 9 | ||||
| -rw-r--r-- | libcxx/src/system_error.cpp | 28 |
2 files changed, 14 insertions, 23 deletions
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp index 260ec76374e..b71d7da1a8b 100644 --- a/libcxx/src/ios.cpp +++ b/libcxx/src/ios.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +#include "__config" #include "ios" #include "streambuf" #include "istream" @@ -52,11 +53,9 @@ string __iostream_category::message(int ev) const { if (ev != static_cast<int>(io_errc::stream) -#ifdef ELAST - && ev <= ELAST -#elif defined(__linux__) - && ev <= 4095 -#endif // ELAST +#ifdef _LIBCPP_ELAST + && ev <= _LIBCPP_ELAST +#endif // _LIBCPP_ELAST ) return __do_message::message(ev); return string("unspecified iostream_category error"); diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp index d5cb2d4ae1b..9c8adc4f323 100644 --- a/libcxx/src/system_error.cpp +++ b/libcxx/src/system_error.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #define _LIBCPP_BUILDING_SYSTEM_ERROR +#include "__config" #include "system_error" #include "string" #include "cstring" @@ -65,13 +66,10 @@ __generic_error_category::name() const _NOEXCEPT string __generic_error_category::message(int ev) const { -#ifdef ELAST - if (ev > ELAST) +#ifdef _LIBCPP_ELAST + if (ev > _LIBCPP_ELAST) return string("unspecified generic_category error"); -#elif defined(__linux__) - if (ev > 4095) - return string("unspecified generic_category error"); -#endif // ELAST +#endif // _LIBCPP_ELAST return __do_message::message(ev); } @@ -100,26 +98,20 @@ __system_error_category::name() const _NOEXCEPT string __system_error_category::message(int ev) const { -#ifdef ELAST - if (ev > ELAST) - return string("unspecified system_category error"); -#elif defined(__linux__) - if (ev > 4095) +#ifdef _LIBCPP_ELAST + if (ev > _LIBCPP_ELAST) return string("unspecified system_category error"); -#endif // ELAST +#endif // _LIBCPP_ELAST return __do_message::message(ev); } error_condition __system_error_category::default_error_condition(int ev) const _NOEXCEPT { -#ifdef ELAST - if (ev > ELAST) - return error_condition(ev, system_category()); -#elif defined(__linux__) - if (ev > 4095) +#ifdef _LIBCPP_ELAST + if (ev > _LIBCPP_ELAST) return error_condition(ev, system_category()); -#endif // ELAST +#endif // _LIBCPP_ELAST return error_condition(ev, generic_category()); } |
