diff options
| author | Andris Pavenis <andris.pavenis@iki.fi> | 2016-01-26 18:07:33 +0200 |
|---|---|---|
| committer | Andris Pavenis <andris@gcc.gnu.org> | 2016-01-26 18:07:33 +0200 |
| commit | 8964d2a090ffb96d822c8d3e5b533b5777285240 (patch) | |
| tree | baa284ffa39fca6b62c477fcb1090beb05d38517 | |
| parent | 2a42e3390f44bef886eb13bcbb660a632c60dd00 (diff) | |
| download | gcc-8964d2a090ffb96d822c8d3e5b533b5777285240.zip gcc-8964d2a090ffb96d822c8d3e5b533b5777285240.tar.gz gcc-8964d2a090ffb96d822c8d3e5b533b5777285240.tar.bz2 | |
Fix build failure when wide character support is not available
* include/c_compatibility/stdlib.h: Include wide character related
definitions only when they are available in cstdlib.
From-SVN: r232835
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_compatibility/stdlib.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bebe638..b96afe6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-01-26 Andris Pavenis <andris.pavenis@iki.fi> + + * include/c_compatibility/stdlib.h: Include wide character related + definitions only when they are available in cstdlib. + 2016-01-25 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/69464 diff --git a/libstdc++-v3/include/c_compatibility/stdlib.h b/libstdc++-v3/include/c_compatibility/stdlib.h index bd72580..31e7e5f 100644 --- a/libstdc++-v3/include/c_compatibility/stdlib.h +++ b/libstdc++-v3/include/c_compatibility/stdlib.h @@ -62,9 +62,11 @@ using std::getenv; using std::labs; using std::ldiv; using std::malloc; +#ifdef _GLIBCXX_HAVE_MBSTATE_T using std::mblen; using std::mbstowcs; using std::mbtowc; +#endif // _GLIBCXX_HAVE_MBSTATE_T using std::qsort; using std::rand; using std::realloc; @@ -73,8 +75,10 @@ using std::strtod; using std::strtol; using std::strtoul; using std::system; +#ifdef _GLIBCXX_USE_WCHAR_T using std::wcstombs; using std::wctomb; +#endif // _GLIBCXX_USE_WCHAR_T #endif #endif |