diff options
| author | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-22 15:27:04 +0000 |
|---|---|---|
| committer | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-22 15:27:04 +0000 |
| commit | e1cc2b2778f70e065dbe4189d50399c926a6221c (patch) | |
| tree | 65a1f97e3b15fc4cbd56a7eb3849d2ed63ac02f9 /libjava | |
| parent | e0764278acaecd19eef654eac15197913a314b42 (diff) | |
| download | gcc-e1cc2b2778f70e065dbe4189d50399c926a6221c.tar.gz | |
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fe0a7f0b654..fe249bb3ece 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 7fd4fe04d6f..a62378101ad 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; |