diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2004-10-22 15:27:04 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@gcc.gnu.org> | 2004-10-22 15:27:04 +0000 |
| commit | 969def55395b4bb4f544419b64294257a68a154b (patch) | |
| tree | 65a1f97e3b15fc4cbd56a7eb3849d2ed63ac02f9 /libjava | |
| parent | 279b5b3c9551276f19f0d7f1fe68fde2c8706376 (diff) | |
| download | gcc-969def55395b4bb4f544419b64294257a68a154b.zip gcc-969def55395b4bb4f544419b64294257a68a154b.tar.gz gcc-969def55395b4bb4f544419b64294257a68a154b.tar.bz2 | |
* gnu/java/net/natPlainSocketImplPosix.cc
(gnu::java::net::PlainSocketImpl::available): Call FIONREAD ioctl
with 'int *' argument instead of 'long *'.
From-SVN: r89450
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 fe0a7f0..fe249bb 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 7fd4fe0..a623781 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; |