diff options
-rw-r--r-- | libjava/ChangeLog | 5 | ||||
-rw-r--r-- | libjava/java/net/natNetworkInterface.cc | 7 |
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++; } |