diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2012-02-14 22:59:17 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2012-02-14 22:59:17 +0000 |
| commit | c07548ab10fd05d5c729fa834afc8683828027ae (patch) | |
| tree | 27da5774219be0366103e25f0fac16c0ea7e97a0 /ACE/ace/SOCK_Dgram_Mcast.cpp | |
| parent | 169c70c34ad4e5e3bada7605e35a25924b0d3388 (diff) | |
| download | ATCD-c07548ab10fd05d5c729fa834afc8683828027ae.tar.gz | |
Tue Feb 14 22:57:00 UTC 2012 William R. Otte <wotte@dre.vanderbilt.edu>
* ace/ACE.cpp:
* ace/Dev_Poll_Reactor.cpp:
* ace/Handle_Set.cpp:
* ace/High_Res_Timer.h:
* ace/High_Res_Timer.cpp:
* ace/INET_Addr.h:
* ace/INET_Addr.cpp:
* ace/Monitor_Control/Bytes_Received_Monitor.h:
* ace/Monitor_Control/Bytes_Received_Monitor.cpp:
* ace/Monitor_Control/Bytes_Sent_Monitor.h:
* ace/Monitor_Control/Bytes_Sent_Monitor.cpp:
* ace/Monitor_Control/CPU_Load_Monitor.h:
* ace/Monitor_Control/CPU_Load_Monitor.cpp:
* ace/Monitor_Control/Linux_Network_Interface_Monitor.h:
* ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
* ace/Monitor_Control/Num_Threads_Monitor.h:
* ace/Monitor_Control/Num_Threads_Monitor.cpp:
* ace/Monitor_Control/Packets_Received_Monitor.h:
* ace/Monitor_Control/Packets_Received_Monitor.cpp:
* ace/Monitor_Control/Packets_Sent_Monitor.h:
* ace/Monitor_Control/Packets_Sent_Monitor.cpp:
* ace/OS_NS_netdb.cpp:
* ace/OS_NS_sys_socket.h:
* ace/OS_NS_sys_socket.inl:
* ace/OS_NS_time.inl:
* ace/OS_NS_unistd.inl:
* ace/SOCK_Dgram.cpp:
* ace/SOCK_Dgram_Mcast.cpp:
* ace/Select_Reactor_T.cpp:
* ace/config-linux.h:
* ace/os_include/os_pthread.h:
* apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h:
* examples/APG/Signals/SigInfo.cpp:
* tests/INET_Addr_Test_IPV6.cpp:
* tests/MT_Reference_Counted_Event_Handler_Test.cpp:
* tests/Malloc_Test.cpp:
* tests/Multicast_Test.cpp:
* tests/Naming_Test.cpp:
* tests/Proactor_Test.cpp:
* tests/Proactor_Test_IPV6.cpp:
* tests/Proactor_UDP_Test.cpp:
* tests/Process_Test.cpp:
* tests/SSL/Bug_2912_Regression_Test.cpp:
Created a new macro, ACE_LINUX, which replaces all non-standard
tests for linux, __linux, and __linux__.
Diffstat (limited to 'ACE/ace/SOCK_Dgram_Mcast.cpp')
| -rw-r--r-- | ACE/ace/SOCK_Dgram_Mcast.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index 13adb17092c..abac401f790 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -8,7 +8,7 @@ #include "ace/os_include/net/os_if.h" #include "ace/os_include/arpa/os_inet.h" -#if defined (__linux__) && defined (ACE_HAS_IPV6) +#if defined (ACE_LINUX) && defined (ACE_HAS_IPV6) #include "ace/OS_NS_sys_socket.h" #endif @@ -257,7 +257,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, if (mcast_addr.get_type () == AF_INET6) { size_t nr_subscribed = 0; -# if defined(__linux__) +# if defined(ACE_LINUX) struct if_nameindex *intf = 0; intf = ACE_OS::if_nameindex (); @@ -552,7 +552,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, ip_mreq mreq; #if defined (ACE_HAS_IPV6) ipv6_mreq mreq6; -#endif /* __linux__ && ACE_HAS_IPV6 */ +#endif /* ACE_LINUX && ACE_HAS_IPV6 */ // Open the socket IFF this is the first ::subscribe and ::open // was not explicitly invoked. @@ -616,7 +616,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (mcast_addr.get_type () == AF_INET6) { size_t nr_unsubscribed = 0; -# if defined(__linux__) +# if defined(ACE_LINUX) struct if_nameindex *intf; |