aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2002-09-17 10:57:14 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2002-09-17 10:57:14 +0000
commit17656182f77cf4634dad4bbff9102d759ffd03b2 (patch)
tree50f71946dbd268c18b1cf4bf6012e5c0c7d7c6f7 /libjava
parenteaff3bf8c3fca80a61ee8b00e13a6e8a0a11da37 (diff)
downloadgcc-17656182f77cf4634dad4bbff9102d759ffd03b2.zip
gcc-17656182f77cf4634dad4bbff9102d759ffd03b2.tar.gz
gcc-17656182f77cf4634dad4bbff9102d759ffd03b2.tar.bz2
natNetworkInterface.cc: Removed unneed and yet wrong includes.
2002-09-17 Michael Koch <konqueror@gmx.de> * java/net/natNetworkInterface.cc: Removed unneed and yet wrong includes. From-SVN: r57246
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/net/natNetworkInterface.cc7
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 33e30ab..8c21e1a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2002-09-17 Michael Koch <konqueror@gmx.de>
+ * java/net/natNetworkInterface.cc:
+ Removed unneed and yet wrong includes.
+
+2002-09-17 Michael Koch <konqueror@gmx.de>
+
* java/net/NetworkInterface.java: New file.
* java/net/natNetworkInterface.java: New file.
* configure.in: Added check for net/if.h.
diff --git a/libjava/java/net/natNetworkInterface.cc b/libjava/java/net/natNetworkInterface.cc
index 9273592..75e904d 100644
--- a/libjava/java/net/natNetworkInterface.cc
+++ b/libjava/java/net/natNetworkInterface.cc
@@ -52,8 +52,7 @@ details. */
#include <gcj/cni.h>
#include <jvm.h>
#include <java/net/NetworkInterface.h>
-#include <java/net/Inet4Address.h>
-#include <java/net/Inet6Address.h>
+#include <java/net/InetAddress.h>
#include <java/net/SocketException.h>
#include <java/util/Vector.h>
@@ -122,8 +121,8 @@ java::net::NetworkInterface::getRealNetworkInterfaces ()
jbyteArray baddr = JvNewByteArray (len);
memcpy (elements (baddr), &(sa.sin_addr), len);
jstring if_name = JvNewStringLatin1 (if_record->ifr_name);
- Inet4Address* address =
- new java::net::Inet4Address (baddr, JvNewStringLatin1 (""));
+ InetAddress* address =
+ new java::net::InetAddress (baddr, JvNewStringLatin1 (""));
ht->add (new NetworkInterface (if_name, address));
if_record++;
}