Fix mingw32 builds.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71299 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6bec6ed..1021607 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.
 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 (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"));
 
   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;
   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 (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
 }
 
 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);
 {
   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->fnum = new_socket;
   s->localport = localport;

-  s->address = new InetAddress (raddr, NULL);
+  s->address = new ::java::net::InetAddress (raddr, NULL);

   s->port = rport;
   return;
 
   s->port = rport;
   return;