diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2001-08-01 17:53:00 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2001-08-01 17:53:00 +0000 |
| commit | 60a78ccfac331b0d4ff71fcdddcfc302817eb110 (patch) | |
| tree | f5dc8cf40aeb44dfd1791af25d70f89af31ffd81 /libjava/include | |
| parent | 2a25b23f7fc4970eb1760f5a3001e626720fa844 (diff) | |
| download | gcc-60a78ccfac331b0d4ff71fcdddcfc302817eb110.tar.gz | |
re PR libgcj/3694 (natPlainDatagramSocketImpl.cc doesn't compile in ALPHA OSF1)
* include/posix.h (_POSIX_PII_SOCKET): Define.
* configure.in (HAVE_SOCKLEN_T): Define.
* java/net/natPlainSocketImpl.cc [!HAVE_SOCKLEN_T]: Move socklen_t
definition up.
(_JV_accept): New function, avoids Tru64 UNIX accept macro.
(java::net::PlainSocketImpl::accept): Use it.
Fixes PRs libgcj/3694, libgcj/3696.
* configure.in (HAVE_STRUCT_IPV6_MREQ): New test.
* acconfig.h (HAVE_STRUCT_IPV6_MREQ): Provide template.
* configure, include/config.h.in: Regenerate.
* java/net/natPlainDatagramSocketImpl.cc (union McastReq): Use it.
(mcastGrp): Likewise.
(java::net::PlainDatagramSocketImpl::setOption): Guard against
missing IPV6_MULTICAST_IF.
Fixes PR libgcj/3694.
From-SVN: r44546
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/config.h.in | 3 | ||||
| -rw-r--r-- | libjava/include/posix.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index f23c881d91e..cc3d773d255 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -83,6 +83,9 @@ /* Define if struct ip_mreq is defined in netinet/in.h. */ #undef HAVE_STRUCT_IP_MREQ +/* Define if struct ipv6_mreq is defined in netinet/in.h. */ +#undef HAVE_STRUCT_IPV6_MREQ + /* Define it socklen_t typedef is in sys/socket.h. */ #undef HAVE_SOCKLEN_T diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 278f7eb773b..e7ba3174354 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -8,6 +8,11 @@ This software is copyrighted work licensed under the terms of the Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ +/* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of + socket functions with socklen_t instead of size_t. This must be defined + early so <standards.h> defines the correct version of __PIIX. */ +#define _POSIX_PII_SOCKET + #include <time.h> #include <sys/types.h> |