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<char>::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 e647afe3265abf7fe061b509aa22f1f5e4b84d84..6d5ecf1927c89b90a7f0ae66af3b2fe8858484e5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-05  Richard Sandiford  <rsandifo@redhat.com>
+
+       * 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.
+
 2004-02-05  Paolo Carlini  <pcarlini@suse.de>
 
        * 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 b1d55d0e02e09a46150ff83474803ca9f274494c..8cba0db48170ce18901ed02ff4596062a0c8a3f7 100644 (file)
--- 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 41ce7edbc5d7619171bf2892e4f555f45efa37a5..6b0174b522df5980c992b49d4e92bb8c98046af4 100644 (file)
--- 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