Message ID | AANLkTimj_+uGgVcDRBmbhzMYtpz=6rviqgUO5CyWvQBh@mail.gmail.com |
---|---|
State | New |
Headers | show |
On 12/02/2010 01:34 PM, Kai Tietz wrote:
> Retested. Ok for apply?
Ok, thanks.
Paolo.
2010/12/2 Paolo Carlini <paolo.carlini@oracle.com>: > On 12/02/2010 01:34 PM, Kai Tietz wrote: >> Retested. Ok for apply? > Ok, thanks. > > Paolo. > Applied to trunk at revision 167369. Thanks, Kai
Index: gcc/libstdc++-v3/config/io/basic_file_stdio.cc =================================================================== --- gcc.orig/libstdc++-v3/config/io/basic_file_stdio.cc 2010-02-22 11:48:20.000000000 +0100 +++ gcc/libstdc++-v3/config/io/basic_file_stdio.cc 2010-12-02 13:22:37.132157000 +0100 @@ -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. Index: gcc/libstdc++-v3/config/os/mingw32/os_defines.h =================================================================== --- gcc.orig/libstdc++-v3/config/os/mingw32/os_defines.h 2009-12-11 14:57:34.000000000 +0100 +++ gcc/libstdc++-v3/config/os/mingw32/os_defines.h 2010-12-02 13:15:19.926233900 +0100 @@ -60,4 +60,9 @@ // See libstdc++/37522. #define _GLIBCXX_HAVE_BROKEN_VSWPRINTF 1 +// See libstdc++/43738 +// On native windows targets there is no ioctl function. And the existing +// ioctlsocket function doesn't work for normal file-descriptors. +#define _GLIBCXX_NO_IOCTL 1 + #endif