diff options
| author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 20:11:32 +0000 |
|---|---|---|
| committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 20:11:32 +0000 |
| commit | 2c735de83ed5eb9c5550f9d3bd560f93de438690 (patch) | |
| tree | 53ba7acdeb3e1ec1cb70b5643327157477d4a6bf /libstdc++-v3/config | |
| parent | 40969701f02a48af3c28325b0ffc9d1964ec645d (diff) | |
| download | gcc-2c735de83ed5eb9c5550f9d3bd560f93de438690.tar.gz | |
* config/os/irix/irix6.5/os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T):
Define.
* config/io/basic_file_stdio.cc (__basic_file<char>::showmanyc): Use
it to decide whether FIONREAD should take an off_t or int argument.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77336 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config')
| -rw-r--r-- | libstdc++-v3/config/io/basic_file_stdio.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/irix/irix6.5/os_defines.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc index b1d55d0e02e..8cba0db4817 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc @@ -267,7 +267,11 @@ namespace std { #ifdef FIONREAD // Pipes and sockets. +#ifdef _GLIBCXX_FIONREAD_TAKES_OFF_T + off_t __num = 0; +#else int __num = 0; +#endif int __r = ioctl(this->fd(), FIONREAD, &__num); if (!__r && __num >= 0) return __num; diff --git a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h index 41ce7edbc5d..6b0174b522d 100644 --- a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h +++ b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h @@ -51,5 +51,8 @@ // GCC does not use thunks on IRIX. #define _G_USING_THUNKS 0 +// FINOREAD takes an "off_t *" as argument. +#define _GLIBCXX_FIONREAD_TAKES_OFF_T + #endif |