From: Anthony Green <green@redhat.com>
Date: Thu, 11 Sep 2003 12:30:05 +0000 (+0000)
Subject: Fix mingw32 builds.
X-Git-Tag: releases/gcc-3.4.0~3781
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cda85569ad54bf2c27f27524abc89d5096f03e4b;p=thirdparty%2Fgcc.git

Fix mingw32 builds.

From-SVN: r71299
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6bec6ed77d05..1021607f4690 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 ae4b0925c596..f9311417d7cf 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 e4837ed4f716..93393803f2d1 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;