From 04fddc99fddd5782415d2f67734a3a358ed965b1 Mon Sep 17 00:00:00 2001 From: ghazi Date: Wed, 25 Apr 2001 20:27:06 +0000 Subject: [PATCH] * java/net/natInetAddress.cc (java::net::InetAddress::aton): Wrap use of inet_pton in HAVE_INET6. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41547 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/net/natInetAddress.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8a0812a8015..142449f242f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-04-25 Kaveh R. Ghazi + + * java/net/natInetAddress.cc (java::net::InetAddress::aton): + Wrap use of inet_pton in HAVE_INET6. + 2001-04-25 Bryce McKinlay java.security merge and ClassLoader compliance fixes. diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc index 68a0b411828..627fd3c6eea 100644 --- a/libjava/java/net/natInetAddress.cc +++ b/libjava/java/net/natInetAddress.cc @@ -118,7 +118,7 @@ java::net::InetAddress::aton (jstring host) blen = 4; } #endif -#ifdef HAVE_INET_PTON +#if defined (HAVE_INET_PTON) && defined (HAVE_INET6) char inet6_addr[16]; if (len == 0 && inet_pton (AF_INET6, hostname, inet6_addr) > 0) { -- 2.11.4.GIT