aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>2001-04-25 20:27:06 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>2001-04-25 20:27:06 +0000
commit9e65a913b61c9366349eee365616f380abbc251e (patch)
treef6092b9c37199762563eaed016dc41e732900b11 /libjava
parentddbb6d43a365a1c326602e46d327241f49e49813 (diff)
downloadgcc-9e65a913b61c9366349eee365616f380abbc251e.zip
gcc-9e65a913b61c9366349eee365616f380abbc251e.tar.gz
gcc-9e65a913b61c9366349eee365616f380abbc251e.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/net/natInetAddress.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8a0812a..142449f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * java/net/natInetAddress.cc (java::net::InetAddress::aton):
+ Wrap use of inet_pton in HAVE_INET6.
+
2001-04-25 Bryce McKinlay <bryce@albatross.co.nz>
java.security merge and ClassLoader compliance fixes.
diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc
index 68a0b41..627fd3c 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)
{