From: Richard Sandiford Date: Thu, 5 Feb 2004 20:11:32 +0000 (+0000) Subject: os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T): Define. X-Git-Tag: releases/gcc-4.0.0~10344 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d232925f0b6d1b5a2c9a122260ae78b51bd60ab0;p=thirdparty%2Fgcc.git os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T): Define. * config/os/irix/irix6.5/os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T): Define. * config/io/basic_file_stdio.cc (__basic_file::showmanyc): Use it to decide whether FIONREAD should take an off_t or int argument. From-SVN: r77336 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e647afe3265a..6d5ecf1927c8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-02-05 Richard Sandiford + + * config/os/irix/irix6.5/os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T): + Define. + * config/io/basic_file_stdio.cc (__basic_file::showmanyc): Use + it to decide whether FIONREAD should take an off_t or int argument. + 2004-02-05 Paolo Carlini * include/bits/stl_function.h: Minor formatting changes. diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc index b1d55d0e02e0..8cba0db48170 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 41ce7edbc5d7..6b0174b522df 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