diff options
| author | Justin R. Wilson <wilsonj@objectcomputing.com> | 2020-04-09 13:18:13 -0500 |
|---|---|---|
| committer | Justin R. Wilson <wilsonj@objectcomputing.com> | 2020-04-09 13:18:13 -0500 |
| commit | ceb4c6b8853ecf9d94e82c744faaaf19fbe5da4c (patch) | |
| tree | 141a07ab87506249544d2f97671370c098f6bd94 | |
| parent | 71a255781a2dd7349037bda4686120b13c531f12 (diff) | |
| download | ATCD-ceb4c6b8853ecf9d94e82c744faaaf19fbe5da4c.tar.gz | |
Handle Windows
| -rw-r--r-- | ACE/NEWS | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.h | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 2 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 1 |
5 files changed, 10 insertions, 3 deletions
@@ -1,6 +1,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9 ==================================================== +. _WIN32_WINNT updated to 0x0600 from 0x0501. + USER VISIBLE CHANGES BETWEEN ACE-6.5.7 and ACE-6.5.8 ==================================================== diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index faa6cd9bdfb..e72a70e94e5 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -280,6 +280,10 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION char *if_indextoname (unsigned int ifindex, char *ifname); +#if defined(ACE_WIN32) + struct if_nameindex {}; +#endif + ACE_NAMESPACE_INLINE_FUNCTION struct if_nameindex *if_nameindex (void); diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index d8818147a02..5ff9ecae398 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -1049,7 +1049,7 @@ ACE_INLINE struct if_nameindex * ACE_OS::if_nameindex (void) { ACE_OS_TRACE ("ACE_OS::if_nameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#if defined (ACE_LACKS_IF_NAME_INDEX) || defined(ACE_WIN32) ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *, 0); @@ -1060,7 +1060,7 @@ ACE_INLINE void ACE_OS::if_freenameindex (struct if_nameindex *ptr) { ACE_OS_TRACE ("ACE_OS::if_freenameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#if defined (ACE_LACKS_IF_NAME_INDEX) || defined(ACE_WIN32) ACE_UNUSED_ARG (ptr); #else if (ptr != 0) diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index c9a4cf6abb2..ea482fb234c 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -56,7 +56,7 @@ #endif /* _WIN64 || WIN64 */ #if !defined (_WIN32_WINNT) -# define _WIN32_WINNT 0x0501 // pretend it's at least Windows XP or Win2003 +# define _WIN32_WINNT 0x0600 // pretend it's at least Windows Vista #endif // If the invoking procedure turned off debugging by setting NDEBUG, then diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index e3cb6842340..a0d815e2165 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -40,6 +40,7 @@ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # include /**/ <ws2tcpip.h> +# include /**/ <iphlpapi.h> #endif /* ACE_HAS_WINSOCK2 */ // Place all additions (especially function declarations) within extern "C" {} |