diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 19:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 19:12:58 +0100 |
| commit | 2709113c83465f8e0e6d6e63db6032106523a9f1 (patch) | |
| tree | 760eb6f99176aebf35403a9b4a20ec54977567df /drivers | |
| parent | 3bdd1ff3875450d90f7a695aa5d527a47558d80c (diff) | |
| parent | 6770357e47b5fcc1d829e0890a3140c91be16872 (diff) | |
Merge pull request #24499 from akien-mga/android-thirdparty
Android: Better identify thirdparty C/C++ code
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/ip_unix.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index 949609bb9a..b39be64bef 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -55,10 +55,12 @@ #include <iphlpapi.h> #endif // MINGW hack #endif -#else +#else // UNIX #include <netdb.h> #ifdef ANDROID_ENABLED -#include "platform/android/ifaddrs_android.h" +// We could drop this file once we up our API level to 24, +// where the NDK's ifaddrs.h supports to needed getifaddrs. +#include "thirdparty/misc/ifaddrs-android.h" #else #ifdef __FreeBSD__ #include <sys/types.h> @@ -201,7 +203,7 @@ void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { #endif -#else +#else // UNIX void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { |