diff options
| author | Anthony Green <green@redhat.com> | 2003-09-11 12:30:05 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2003-09-11 12:30:05 +0000 |
| commit | cda85569ad54bf2c27f27524abc89d5096f03e4b (patch) | |
| tree | 5f039dc230733837e57060f5ad7f8bf663a70057 | |
| parent | 6b00c969c4be4455d900fd7f2d802bb68f45598c (diff) | |
| download | gcc-cda85569ad54bf2c27f27524abc89d5096f03e4b.zip gcc-cda85569ad54bf2c27f27524abc89d5096f03e4b.tar.gz gcc-cda85569ad54bf2c27f27524abc89d5096f03e4b.tar.bz2 | |
Fix mingw32 builds.
From-SVN: r71299
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplWin32.cc | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6bec6ed..1021607 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-09-10 Anthony Green <green@redhat.com> + + * gnu/java/net/natPlainDatagramSocketImplWin32.cc (peekData): + Specify full name when referencing ::java::net::InetAddress. + * gnu/java/net/natPlainSocketImplWin32.cc (accept): Ditto. + Fix argument type. + 2003-09-10 Michael Koch <konqueror@gmx.de> * acconfig.h (__NO_MATH_INLINES): Removed. diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc index ae4b092..f931141 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc @@ -235,7 +235,7 @@ gnu::java::net::PlainDatagramSocketImpl::peekData(::java::net::DatagramPacket *p else throw new ::java::net::SocketException (JvNewStringUTF ("invalid family")); - p->setAddress (new InetAddress (raddr, NULL)); + p->setAddress (new ::java::net::InetAddress (raddr, NULL)); p->setPort (rport); p->setLength ((jint) retlen); return rport; diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc index e4837ed..9339380 100644 --- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc @@ -228,7 +228,7 @@ gnu::java::net::PlainSocketImpl::listen (jint backlog) } void -gnu::java::net::PlainSocketImpl::accept (::java::net::PlainSocketImpl *s) +gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s) { union SockAddr u; socklen_t addrlen = sizeof(u); @@ -312,7 +312,7 @@ gnu::java::net::PlainSocketImpl::accept (::java::net::PlainSocketImpl *s) s->fnum = new_socket; s->localport = localport; - s->address = new InetAddress (raddr, NULL); + s->address = new ::java::net::InetAddress (raddr, NULL); s->port = rport; return; |