summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-10-25 08:57:17 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-10-25 08:57:17 +0000
commitdffb9a719f9ef2427fb9cc41504137c85ce7b50f (patch)
tree9635a1dd50984425f6d42f6c3cc5aa5a4fdaa328
parentcbca08d722a9d7d8ebb9be129f241bda06bdd796 (diff)
downloadATCD-dffb9a719f9ef2427fb9cc41504137c85ce7b50f.tar.gz
Wed Oct 25 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ace/SOCK_Dgram.cpp6
-rw-r--r--ACE/ace/config-rtems.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index cda8433492d..ef93c258b6a 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -615,6 +615,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
return -1;
lmreq.imr_interface.s_addr =
ACE_HTONL (interface_addr.get_ip_address ());
+#elif (ACE_LACKS_IFREQ)
+ // Do nothing
#else
ifreq if_address;
@@ -625,8 +627,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
&if_address) == -1)
return -1;
- sockaddr_in *socket_address;
- socket_address = reinterpret_cast<sockaddr_in*> (&if_address.ifr_addr);
+ sockaddr_in *socket_address =
+ = reinterpret_cast<sockaddr_in*> (&if_address.ifr_addr);
lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr;
#endif /* ACE_WIN32 || __INTERIX */
}
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index f63515c261f..2dda130fd88 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -166,6 +166,7 @@
# define ACE_LACKS_IP_MREQ
# define ACE_LACKS_PROTOENT
# define ACE_LACKS_SERVENT
+# define ACE_LACKS_IFREQ
// Missing methods
# define ACE_LACKS_GETHOSTBYADDR