This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [Patch] Moving java.net.Plain*SocketImpl
- From: Anthony Green <green at redhat dot com>
- To: Michael Koch <konqueror at gmx dot de>
- Cc: java-patches at gcc dot gnu dot org
- Date: 10 Sep 2003 19:44:10 -0700
- Subject: Re: [Patch] Moving java.net.Plain*SocketImpl
- Organization: Red Hat, Inc.
- References: <200309061818.28593.konqueror@gmx.de>
On Sat, 2003-09-06 at 09:18, Michael Koch wrote:
> I wrote a patch to move java.net.Plain*SocketImpl and helper classes
> to gnu.java.net. The attached patch is also tested by Mohan Embar and
> Richard Earnshaw on their platforms (win32 and arm/newlib).
I had to make the following fixes for mingw32. Ok?
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.
Index: libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
===================================================================
RCS file: /cvs/uberbaum/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc,v
retrieving revision 1.1
diff -c -u -p -r1.1 natPlainDatagramSocketImplWin32.cc
--- libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc 10 Sep 2003 17:39:20 -0000 1.1
+++ libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc 11 Sep 2003 02:38:00 -0000
@@ -235,7 +235,7 @@ gnu::java::net::PlainDatagramSocketImpl:
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;
Index: libjava/gnu/java/net/natPlainSocketImplWin32.cc
===================================================================
RCS file: /cvs/uberbaum/libjava/gnu/java/net/natPlainSocketImplWin32.cc,v
retrieving revision 1.1
diff -c -u -p -r1.1 natPlainSocketImplWin32.cc
--- libjava/gnu/java/net/natPlainSocketImplWin32.cc 10 Sep 2003 17:39:20 -0000 1.1
+++ libjava/gnu/java/net/natPlainSocketImplWin32.cc 11 Sep 2003 02:38:01 -0000
@@ -228,7 +228,7 @@ gnu::java::net::PlainSocketImpl::listen
}
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
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;
AG
--
Anthony Green <green@redhat.com>
Red Hat, Inc.