diff options
author | Brad King <brad.king@kitware.com> | 2018-03-07 11:48:34 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-03-07 11:48:34 (GMT) |
commit | 2c5b4359f80f7e0ef5442784ca55a42b6c2bdd17 (patch) | |
tree | 6c055683d8179cb441ea511530aa8e0f1ddf791b /Source/kwsys/SystemInformation.cxx | |
parent | 9c1efb614dee294cb3a1077e8a232573f309c605 (diff) | |
parent | 64d4308d8347150d072c2f11f9dd557ccaa1dfb2 (diff) | |
download | CMake-2c5b4359f80f7e0ef5442784ca55a42b6c2bdd17.zip CMake-2c5b4359f80f7e0ef5442784ca55a42b6c2bdd17.tar.gz CMake-2c5b4359f80f7e0ef5442784ca55a42b6c2bdd17.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-03-07 (2ad561e7)
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
-rw-r--r-- | Source/kwsys/SystemInformation.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 7503469..2b9d7b1 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -121,7 +121,11 @@ typedef int siginfo_t; #if defined(KWSYS_SYS_HAS_IFADDRS_H) #include <ifaddrs.h> #include <net/if.h> -#if !defined(__LSB_VERSION__) /* LSB has no getifaddrs */ +#if defined(__LSB_VERSION__) +/* LSB has no getifaddrs */ +#elif defined(__ANDROID_API__) && __ANDROID_API__ < 24 +/* Android has no getifaddrs prior to API 24. */ +#else #define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN #endif #endif |