From: Kaveh R. Ghazi Date: Wed, 25 Apr 2001 20:27:06 +0000 (+0000) Subject: natInetAddress.cc (java::net::InetAddress::aton): Wrap use of inet_pton in HAVE_INET6. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e65a913b61c9366349eee365616f380abbc251e;p=gcc.git natInetAddress.cc (java::net::InetAddress::aton): Wrap use of inet_pton in HAVE_INET6. * java/net/natInetAddress.cc (java::net::InetAddress::aton): Wrap use of inet_pton in HAVE_INET6. From-SVN: r41547 --- 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) {