diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 10:16:04 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 10:16:04 +0000 |
| commit | cf9498a89fd346d3e9989cb6480ebc495ef40345 (patch) | |
| tree | 8a6600d7ecfed57029e5fe6bcacbb895c3ca5b97 /libjava/java/net/natVMNetworkInterfaceWin32.cc | |
| parent | d544e7d32e6c6901358ee5465a633aaf49690512 (diff) | |
| download | gcc-cf9498a89fd346d3e9989cb6480ebc495ef40345.tar.gz | |
2006-11-03 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java: Removed.
* java/net/natInetAddressNoNet.cc: Likewise.
* java/net/natInetAddressPosix.cc: Likewise.
* java/net/natInetAddressWin32.cc: Likewise.
* java/net/VMInetAddress.java (getLocalHostname,
lookupInaddrAny, getHostByAddr, getHostByName,
aton): Replace glue methods with native ones.
* java/net/natVMInetAddressNoNet.cc: New file.
* java/net/natVMInetAddressPosix.cc: Likewise.
* java/net/natVMInetAddressWin32.cc: Likewise.
* Makefile.am, configure.ac: Reflect the above.
* sources.am, Makefile.in, configure: Rebuilt.
* java/net/natVMNetworkInterfaceWin32.cc
(winsock2GetRealNetworkInterfaces): Create InetAddress
objects using InetAddress.getByAddress.
* gnu/java/net/natPlainSocketImplWin32.cc
(accept, getOption): Likewise.
* gnu/java/net/natPlainDatagramSocketImplWin32.cc
(peekData, receive, getOption): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118451 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/natVMNetworkInterfaceWin32.cc')
| -rw-r--r-- | libjava/java/net/natVMNetworkInterfaceWin32.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/net/natVMNetworkInterfaceWin32.cc b/libjava/java/net/natVMNetworkInterfaceWin32.cc index d42f33de90d..c9b14d57da8 100644 --- a/libjava/java/net/natVMNetworkInterfaceWin32.cc +++ b/libjava/java/net/natVMNetworkInterfaceWin32.cc @@ -12,7 +12,7 @@ details. */ #undef STRICT #include <java/net/NetworkInterface.h> -#include <java/net/Inet4Address.h> +#include <java/net/InetAddress.h> #include <java/net/SocketException.h> #include <java/net/VMNetworkInterface.h> #include <java/util/Vector.h> @@ -83,8 +83,8 @@ winsock2GetRealNetworkInterfaces (jstring* pjstrName, } jstring if_name = _Jv_Win32NewString (szName); - java::net::Inet4Address* address = - new java::net::Inet4Address (baddr, JvNewStringLatin1 ("")); + java::net::InetAddress* address = + java::net::InetAddress::getByAddress (baddr); pjstrName[i] = if_name; ppAddress[i] = address; } |