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 8a0812a8015d8ae9f096e6b269bd45e193eddad7..142449f242fef421bb97281a64d1bcdac4dd7492 100644 (file)
--- 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 68a0b411828c37d96713afc209e5453c4f435259..627fd3c6eea3e7040b37b13765e8ec43da66c278 100644 (file)
--- 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)
     {