Fix mingw32 builds.

From-SVN: r71299

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6bec6ed77d0518b311c65e23ad22a31a1c8b8409..1021607f4690512a8a69ab010728337c07fd1253 100644 (file)
--- 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 ae4b0925c59621d0e80275c93910e302fe0a3952..f9311417d7cfdd72e2e8d745387dba3e8060ed80 100644 (file)
--- 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 e4837ed4f71682fd3c3df2d4af5bbc24d73e16c5..93393803f2d11db63d7feb987b4231037230b32e 100644 (file)
--- 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;