From: uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 22 Oct 2004 15:27:04 +0000 (+0000)
Subject: 	* gnu/java/net/natPlainSocketImplPosix.cc
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1cc2b2778f70e065dbe4189d50399c926a6221c;p=thirdparty%2Fgcc.git

	* 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 fe0a7f0b6541..fe249bb3ece6 100644
--- 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 7fd4fe04d6f6..a62378101ad6 100644
--- 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;