diff options
| author | Chip Jones <jonesc@objectcomputing.com> | 2020-05-14 11:49:35 -0500 |
|---|---|---|
| committer | Chip Jones <jonesc@objectcomputing.com> | 2020-05-14 11:49:35 -0500 |
| commit | 6a633b1ba8c0fbe423cf1d993fbfa2d7a338acf3 (patch) | |
| tree | 9e6ac2907ce7d509c8c9d664c06ce11c50adc02d | |
| parent | 5c8267be775feee34018e9a219d3850a783a5c18 (diff) | |
| download | ATCD-6a633b1ba8c0fbe423cf1d993fbfa2d7a338acf3.tar.gz | |
Simplify Win32/Android 'if_nameindex' conditional.
| -rw-r--r-- | ACE/ace/config-win32-common.h | 1 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 624cce15114..31b3bffd3f9 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -569,6 +569,7 @@ # define ACE_LACKS_IF_NAMETOINDEX #endif #define ACE_LACKS_IF_NAMEINDEX +#define ACE_LACKS_STRUCT_IF_NAMEINDEX // Platform supports IP multicast on Winsock 2 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index 6a865fb2e34..f02af7b5ef8 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -102,8 +102,7 @@ struct ifconf { # define IFF_BROADCAST 0x2 #endif /* IFF_BROADCAST */ -#if (defined ACE_LACKS_IF_NAMEINDEX && defined ACE_HAS_WINSOCK2) || \ - defined ACE_LACKS_STRUCT_IF_NAMEINDEX +#if defined (ACE_LACKS_STRUCT_IF_NAMEINDEX) struct if_nameindex {}; #endif |