This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: RFC: Moving native code in java.net into architecture dependant files - updated patch
- From: Michael Koch <konqueror at gmx dot de>
- To: Richard dot Earnshaw at arm dot com
- Cc: java-patches at gcc dot gnu dot org
- Date: Mon, 24 Mar 2003 13:19:35 +0100
- Subject: Re: RFC: Moving native code in java.net into architecture dependant files - updated patch
- References: <200303241209.h2OC9ZS25568@pc960.cambridge.arm.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Am Montag, 24. März 2003 13:09 schrieb Richard Earnshaw:
> > Am Montag, 24. März 2003 12:27 schrieb Richard Earnshaw:
> > > 2003-03-17 Michael Koch <konqueror at gmx dot de>
> > >
> > > + * configure.in: Create links to architecture dependent files,
> > > + introduced PLATFORMNET variable (set to NoNet for newlib
> > > usage). + * configure: Regenerated.
> > > + * java/net/natInetAddressNoNet.cc,
> > > + java/net/natInetAddressPosix.cc,
> > > + java/net/natInetAddressWin32.cc,
> > > + java/net/natNetworkInterfaceNoNet.cc,
> > > + java/net/natNetworkInterfacePosix.cc,
> > > + java/net/natNetworkInterfaceWin32.cc,
> > > + java/net/natPlainDatagramSocketImplNoNet.cc,
> > > + java/net/natPlainDatagramSocketImplPosix.cc,
> > > + java/net/natPlainDatagramSocketImplWin32.cc,
> > > + java/net/natPlainSocketImplNoNet.cc,
> > > + java/net/natPlainSocketImplPosix.cc,
> > > + java/net/natPlainSocketImplWin32.cc: New files.
> >
> > I hate that news.
>
> Don't we all :-(
>
> > I have made a patch for you. Can you please test it and tell me
> > if its wourking now ?
>
> What about the natPlainSocketImpl problem (problem 3 in previous
> mail)?
Hmm, I hoped that would be fixed with the include of gcj/cni.h but I
was just a little bit blind. Here the next try.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+fvfXWSOgCCdjSDsRArZNAKCStt/28+M6rIUOe3ub8DPrSjiRygCeOYJN
d51jP/gQ7ZnImLOv6hfLZAM=
=OIDR
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1806
diff -u -r1.1806 ChangeLog
--- ChangeLog 24 Mar 2003 08:27:27 -0000 1.1806
+++ ChangeLog 24 Mar 2003 12:17:32 -0000
@@ -1,5 +1,14 @@
2003-03-24 Michael Koch <konqueror at gmx dot de>
+ * java/net/natInetAddressNoNet.cc:
+ Include stddef.h.
+ * java/net/natPlainDatagramSocketImplNoNet.cc:
+ Fixed inlcude of java/net/DatagramPacket.h.
+ * java/net/natPlainSocketImplNoNet.cc:
+ Include some missing classes.
+
+2003-03-24 Michael Koch <konqueror at gmx dot de>
+
* java/io/DataInputStream.java
(): Wrapped documentation line.
(): Fixed @return tag.
Index: java/net/natInetAddressNoNet.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/natInetAddressNoNet.cc,v
retrieving revision 1.1
diff -u -r1.1 natInetAddressNoNet.cc
--- java/net/natInetAddressNoNet.cc 18 Mar 2003 06:01:16 -0000 1.1
+++ java/net/natInetAddressNoNet.cc 24 Mar 2003 12:17:32 -0000
@@ -7,6 +7,7 @@
details. */
#include <config.h>
+#include <stddef.h>
#include <java/net/InetAddress.h>
Index: java/net/natPlainDatagramSocketImplNoNet.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/natPlainDatagramSocketImplNoNet.cc,v
retrieving revision 1.1
diff -u -r1.1 natPlainDatagramSocketImplNoNet.cc
--- java/net/natPlainDatagramSocketImplNoNet.cc 18 Mar 2003 06:01:16 -0000 1.1
+++ java/net/natPlainDatagramSocketImplNoNet.cc 24 Mar 2003 12:17:32 -0000
@@ -12,7 +12,7 @@
#include <java/io/IOException.h>
#include <java/lang/Object.h>
#include <java/net/BindException.h>
-#include <java/net/DatagramPacketInetAddress.h>
+#include <java/net/DatagramPacket.h>
#include <java/net/InetAddress.h>
#include <java/net/NetworkInterface.h>
#include <java/net/PlainDatagramSocketImpl.h>
Index: java/net/natPlainSocketImplNoNet.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/natPlainSocketImplNoNet.cc,v
retrieving revision 1.1
diff -u -r1.1 natPlainSocketImplNoNet.cc
--- java/net/natPlainSocketImplNoNet.cc 18 Mar 2003 06:01:16 -0000 1.1
+++ java/net/natPlainSocketImplNoNet.cc 24 Mar 2003 12:17:32 -0000
@@ -9,7 +9,11 @@
#include <config.h>
#include <platform.h>
+#include <java/io/IOException.h>
+#include <java/net/BindException.h>
+#include <java/net/ConnectException.h>
#include <java/net/PlainSocketImpl.h>
+#include <java/net/SocketException.h>
void
java::net::PlainSocketImpl::create (jboolean)