diff options
| author | Chip Jones <jonesc@objectcomputing.com> | 2020-05-13 15:47:33 -0500 |
|---|---|---|
| committer | Chip Jones <jonesc@objectcomputing.com> | 2020-05-13 16:34:57 -0500 |
| commit | 5c8267be775feee34018e9a219d3850a783a5c18 (patch) | |
| tree | fbaf48d9fc09ab1afae703f07eadae878b9d7011 | |
| parent | 2d36a8c008d8c648421acb7eb04539a3eaa49eeb (diff) | |
| download | ATCD-5c8267be775feee34018e9a219d3850a783a5c18.tar.gz | |
Android NDKs<14.1 lack struct if_nameindex.
Android NDKs 12 and 13 lack a 'struct if_nameindex'
definition even though they support API 24.
| -rw-r--r-- | ACE/ace/config-android.h | 4 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index edd5adecec4..c7253a3b005 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -123,6 +123,10 @@ # endif #endif +#if ACE_ANDROID_NDK_LESS_THAN(14, 0) +# define ACE_LACKS_STRUCT_IF_NAMEINDEX +#endif + #if ACE_ANDROID_NDK_LESS_THAN(14, 0) || __ANDROID_API__ < 24 # define ACE_LACKS_IF_NAMEINDEX #endif diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index ed85fa93d4d..6a865fb2e34 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -102,7 +102,8 @@ struct ifconf { # define IFF_BROADCAST 0x2 #endif /* IFF_BROADCAST */ -#if defined ACE_HAS_WINSOCK2 && defined ACE_LACKS_IF_NAMEINDEX +#if (defined ACE_LACKS_IF_NAMEINDEX && defined ACE_HAS_WINSOCK2) || \ + defined ACE_LACKS_STRUCT_IF_NAMEINDEX struct if_nameindex {}; #endif |