* gnu/java/net/natPlainSocketImplPosix.cc

	(gnu::java::net::PlainSocketImpl::available): Call FIONREAD ioctl
	with 'int *' argument instead of 'long *'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89450 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fe0a7f0b6541072bb6c55e15fa91c57266d94a90..fe249bb3ece68c33e34095194cedb82bb1a36f81 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-22  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * gnu/java/net/natPlainSocketImplPosix.cc
+       (gnu::java::net::PlainSocketImpl::available): Call FIONREAD ioctl
+       with 'int *' argument instead of 'long *'.
+
 2004-10-21  Michael Koch  <konqueror@gmx.de>
 
        * java/net/NetworkInterface.java,

diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
index 7fd4fe04d6f6d53f3651e0243c40abee18db9d38..a62378101ad68616a9ed246a1211899a9cd0f09c 100644 (file)
--- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
@@ -463,7 +463,7 @@ jint
 gnu::java::net::PlainSocketImpl::available(void)
 {
 #if defined(FIONREAD) || defined(HAVE_SELECT)
-  long num = 0;
+  int num = 0;
   int r = 0;
   bool num_set = false;