diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2010-12-02 13:15:10 +0000 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2010-12-02 14:15:10 +0100 |
| commit | 266afdd60e1f7c6429fd7a6902b4b3360f55a90a (patch) | |
| tree | 65f772231a2553dee779bca49e775b496d6e941a /libstdc++-v3/config/io | |
| parent | 8529e24b969fa5bb0446977c8817210c115b9517 (diff) | |
| download | gcc-266afdd60e1f7c6429fd7a6902b4b3360f55a90a.tar.gz | |
re PR libstdc++/43738 (basic_file_stdio.cc uses ioctl on a fd, but not available on mingw32)
2010-12-02 Kai Tietz <kai.tietz@onevision.com>
PR libstdc++/43738
* config/io/basic_file_stdio.cc (showmanyc): Check _GLIBCXX_NO_IOCTL
before use of ioctl.
* config/os/mingw32/os_defines.h (_GLIBCXX_NO_IOCTL): New.
From-SVN: r167369
Diffstat (limited to 'libstdc++-v3/config/io')
| -rw-r--r-- | libstdc++-v3/config/io/basic_file_stdio.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc index 472f12396d3..d2de028f099 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc @@ -334,6 +334,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) streamsize __basic_file<char>::showmanyc() { +#ifndef _GLIBCXX_NO_IOCTL #ifdef FIONREAD // Pipes and sockets. #ifdef _GLIBCXX_FIONREAD_TAKES_OFF_T @@ -344,7 +345,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) int __r = ioctl(this->fd(), FIONREAD, &__num); if (!__r && __num >= 0) return __num; -#endif +#endif +#endif #ifdef _GLIBCXX_HAVE_POLL // Cheap test. |