git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rainer Orth 2012-04-05 10:04:40 +00:00 committed by Rainer Orth
parent 3d3f224949
commit 0e74b5a21f
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
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

2
libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
View File

@ -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,
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"));

12
libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
View File

@ -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,
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"));
@ -635,14 +637,14 @@ gnu::java::net::PlainDatagramSocketImpl::getOption (jint optID)
goto error; goto error;
if (u.address.sin_family == AF_INET) if (u.address.sin_family == AF_INET)
{ {
laddr = JvNewByteArray (4); laddr = JvNewByteArray (4);
memcpy (elements (laddr), &u.address.sin_addr, 4); memcpy (elements (laddr), &u.address.sin_addr, 4);
} }
#ifdef HAVE_INET6 #ifdef HAVE_INET6
else if (u.address.sin_family == AF_INET6) else if (u.address.sin_family == AF_INET6)
{ {
laddr = JvNewByteArray (16); laddr = JvNewByteArray (16);
memcpy (elements (laddr), &u.address6.sin6_addr, 16); memcpy (elements (laddr), &u.address6.sin6_addr, 16);
} }
#endif #endif
else else