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/INET_Addr.h | |
| 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/INET_Addr.h')
| -rw-r--r-- | ACE/ace/INET_Addr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index b8ce15be27f..ef2b5ca1aa0 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -250,13 +250,13 @@ public: int encode = 1, int map = 0); -#if (defined (__linux__) || defined (ACE_WIN32)) && defined (ACE_HAS_IPV6) +#if (defined (ACE_LINUX) || defined (ACE_WIN32)) && defined (ACE_HAS_IPV6) /** * Sets the interface that should be used for this address. This only has * an effect when the address is link local, otherwise it does nothing. */ int set_interface (const char *intf_name); -#endif /* (__linux__ || ACE_WIN32) && ACE_HAS_IPV6 */ +#endif /* (ACE_LINUX || ACE_WIN32) && ACE_HAS_IPV6 */ /// Return the port number, converting it into host byte-order. u_short get_port_number (void) const; |