diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-22 15:45:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-22 15:45:57 +0000 |
| commit | f3fb287342f5554115598baee9466080bf8a15d3 (patch) | |
| tree | c1747d55b1de276ab12ea1a23b091d211b518670 /ACE/ace/Sock_Connect.cpp | |
| parent | eedda60836f6b1a3788219c12d2ee5a0e3f9e853 (diff) | |
| download | ATCD-f3fb287342f5554115598baee9466080bf8a15d3.tar.gz | |
Tue Mar 22 15:40:00 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/os_include/os_ifaddrs.h:
New wrapper file
* ace/OS_NS_stdlib.inl:
* ace/config-WinCE.h:
Added new define to not check for OS in OS_NS_ file
* ace/Sock_Connect.cpp:
use new os_ifaddrs.h wrapper
* tests/Dirent_Test.cpp:
* tests/Test_Output.cpp:
Cleanup
Diffstat (limited to 'ACE/ace/Sock_Connect.cpp')
| -rw-r--r-- | ACE/ace/Sock_Connect.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index a4ef6a54b8c..332b21bb69e 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -29,13 +29,9 @@ # endif /* _AIX */ #endif /* ACE_HAS_IPV6 */ -# if defined (ACE_HAS_GETIFADDRS) -# if defined (ACE_VXWORKS) -# include /**/ <net/ifaddrs.h> -# else -# include /**/ <ifaddrs.h> -# endif /*ACE_VXWORKS */ -# endif /* ACE_HAS_GETIFADDRS */ +#if defined (ACE_HAS_GETIFADDRS) +# include "ace/os_include/os_ifaddrs.h" +#endif /* ACE_HAS_GETIFADDRS */ #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x670) && defined (__RTP__) && defined (ACE_HAS_IPV6) const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; @@ -133,17 +129,6 @@ namespace # define SA_FAMILY sa_family #endif /* ACE_HAS_IPV6 */ -// This is a hack to work around a problem with Visual Age C++ 5 and 6 on AIX. -// Without this, the compiler auto-instantiates the ACE_Auto_Array_Ptr for -// ifreq (contained in this module) but only adds the #include for <net/if.h> -// and not the one for <sys/socket.h> which is also needed. Although we -// don't need the template defined here, it makes the compiler pull in -// <sys/socket.h> and the build runs clean. -#if defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 500) && (__IBMCPP__ < 700) -static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h; -#endif /* AIX && __IBMCPP__ >= 500 */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Bind socket to an unused port. |