diff options
| author | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-21 14:26:44 +0000 |
|---|---|---|
| committer | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-21 14:26:44 +0000 |
| commit | 2e49169de64393c4ebae9e4221b650ff223e9a4a (patch) | |
| tree | 936dcb136f4e1a15f7189da9628cb51caeeaf701 /libjava/java | |
| parent | 7ebd7b4a5cb2eb8093b5722d891eaf9c8b8aa829 (diff) | |
| download | ppe42-gcc-2e49169de64393c4ebae9e4221b650ff223e9a4a.tar.gz ppe42-gcc-2e49169de64393c4ebae9e4221b650ff223e9a4a.zip | |
* configure.in: Check for in_addr_t in netinet/in.h too. Check
for ip_mreq too.
* acconfig.h: Define HAVE_IN_ADDR_T instead of in_addr_t.
(HAVE_STRUCT_IP_MREQ): Added.
* configure, include/config.h.in: Rebuilt.
* java/net/natInetAddress.cc (aton): Typedef in_addr_t to jint
if needed.
* java/net/natPlainDatagramSocketImpl.cc (McastReq, mcastGrp):
Disable if ip_mreq is not available.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28798 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/net/natInetAddress.cc | 3 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc index b15590a0ebc..6e014ab6f86 100644 --- a/libjava/java/net/natInetAddress.cc +++ b/libjava/java/net/natInetAddress.cc @@ -71,6 +71,9 @@ java::net::InetAddress::aton (jstring host) blen = 4; } #elif defined(HAVE_INET_ADDR) +#if ! HAVE_IN_ADDR_T + typedef jint in_addr_t; +#endif in_addr_t laddr = inet_addr (hostname); if (laddr != (in_addr_t)(-1)) { diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 8ef7fd2bd31..66e5dc221bf 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -61,7 +61,9 @@ union SockAddr union McastReq { +#if HAVE_STRUCT_IP_MREQ struct ip_mreq mreq; +#endif #ifdef HAVE_INET6 struct ipv6_mreq mreq6; #endif @@ -323,7 +325,10 @@ java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *inetaddr, int len = haddress->length; int level, opname; const char *ptr; - if (len == 4) + if (0) + ; +#if HAVE_STRUCT_IP_MREQ + else if (len == 4) { level = IPPROTO_IP; opname = join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP; @@ -334,6 +339,7 @@ java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *inetaddr, len = sizeof (struct ip_mreq); ptr = (const char *) &u.mreq; } +#endif #ifdef HAVE_INET6 else if (len == 16) { |
