Commit 0e74b5a2 by Rainer Orth Committed by Rainer Orth

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
parent 3d3f2249
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> 2012-03-25 Gerald Pfeifer <gerald@pfeifer.com>
PR libgcj/52694 PR libgcj/52694
......
...@@ -655,6 +655,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, ...@@ -655,6 +655,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
len = sizeof (struct in_addr); len = sizeof (struct in_addr);
ptr = (const char *) &u.addr; ptr = (const char *) &u.addr;
} }
#ifdef HAVE_INET6
else if (len == 16) else if (len == 16)
{ {
level = IPPROTO_IPV6; level = IPPROTO_IPV6;
...@@ -663,6 +664,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, ...@@ -663,6 +664,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
len = sizeof (struct in6_addr); len = sizeof (struct in6_addr);
ptr = (const char *) &u.addr6; ptr = (const char *) &u.addr6;
} }
#endif
else else
throw throw
new ::java::net::SocketException (JvNewStringUTF ("invalid length")); new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
......
...@@ -540,6 +540,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, ...@@ -540,6 +540,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
len = sizeof (struct in_addr); len = sizeof (struct in_addr);
ptr = (const char *) &u.addr; ptr = (const char *) &u.addr;
} }
#ifdef HAVE_INET6
else if (len == 16) else if (len == 16)
{ {
level = IPPROTO_IPV6; level = IPPROTO_IPV6;
...@@ -548,6 +549,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, ...@@ -548,6 +549,7 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
len = sizeof (struct in6_addr); len = sizeof (struct in6_addr);
ptr = (const char *) &u.addr6; ptr = (const char *) &u.addr6;
} }
#endif
else else
throw throw
new ::java::net::SocketException (JvNewStringUTF ("invalid length")); new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment