Restore HAVE_INET6 tests (PR libgcj/52645)

	PR libgcj/52645
	* gnu/java/net/natPlainDatagramSocketImplPosix.cc (setOption):
	Restore HAVE_INET6 check.
	* gnu/java/net/natPlainDatagramSocketImplWin32.cc (setOption):
	Likewise.

From-SVN: r186161

libjava/ChangeLog

+2012-04-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR libgcj/52645
+	* gnu/java/net/natPlainDatagramSocketImplPosix.cc (setOption):
+	Restore HAVE_INET6 check.
+	* gnu/java/net/natPlainDatagramSocketImplWin32.cc (setOption):
+	Likewise.
+
 2012-03-25  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	PR libgcj/52694

libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc

@@ -655,6 +655,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
 	    len = sizeof (struct in_addr);
 	    ptr = (const char *) &u.addr;
 	  }
+#ifdef HAVE_INET6
 	else if (len == 16)
 	  {
 	    level = IPPROTO_IPV6;
@@ -663,6 +664,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
 	    len = sizeof (struct in6_addr);
 	    ptr = (const char *) &u.addr6;
 	  }
+#endif
 	else
 	  throw
 	    new ::java::net::SocketException (JvNewStringUTF ("invalid length"));

libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc

@@ -540,6 +540,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
       len = sizeof (struct in_addr);
       ptr = (const char *) &u.addr;
     }
+#ifdef HAVE_INET6
   else if (len == 16)
     {
       level = IPPROTO_IPV6;
@@ -548,6 +549,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
       len = sizeof (struct in6_addr);
       ptr = (const char *) &u.addr6;
     }
+#endif
   else
     throw
       new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
@@ -635,14 +637,14 @@ gnu::java::net::PlainDatagramSocketImpl::getOption (jint optID)
         goto error;
       if (u.address.sin_family == AF_INET)
         {
-    laddr = JvNewByteArray (4);
-    memcpy (elements (laddr), &u.address.sin_addr, 4);
+	  laddr = JvNewByteArray (4);
+	  memcpy (elements (laddr), &u.address.sin_addr, 4);
         }
 #ifdef HAVE_INET6
-            else if (u.address.sin_family == AF_INET6)
+      else if (u.address.sin_family == AF_INET6)
         {
-    laddr = JvNewByteArray (16);
-    memcpy (elements (laddr), &u.address6.sin6_addr, 16);
+	  laddr = JvNewByteArray (16);
+	  memcpy (elements (laddr), &u.address6.sin6_addr, 16);
         }
 #endif
       else