diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-10 18:07:53 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-10 18:08:05 +0200 |
| commit | 7c7bb6e7726a13443a9ad0231808f2858636b39f (patch) | |
| tree | d877c707c01c9a44f04acd5f4378b0cf70fece9e | |
| parent | 6eeac2e628b5332dcaee60e5c83861c94e44d04d (diff) | |
| parent | 9256f7d13f5b68ebc2981e8f45777f4bdc43f1b3 (diff) | |
Merge #14127: build: avoid getifaddrs when unavailable
9256f7d13f5b68ebc2981e8f45777f4bdc43f1b3 build: avoid getifaddrs when unavailable (Cory Fields)
Pull request description:
These changes from @theuni help building when targeting platforms that don't always have getifaddrs available like Android < 24
Tree-SHA512: dbfeb83297bd6f00b7991f53eef8a04948d2d739bf47c0524d9ae5335b843b8a5c06ff98c109fe5e6192665e6d0cf58700b8aa7e2a0b410281d3c052881973ff
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/net.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0b96e15b9e..4d84aacce1 100644 --- a/configure.ac +++ b/configure.ac @@ -733,6 +733,10 @@ fi AC_CHECK_HEADERS([endian.h sys/endian.h byteswap.h stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h sys/prctl.h]) +AC_CHECK_DECLS([getifaddrs, freeifaddrs],,, + [#include <sys/types.h> + #include <ifaddrs.h>] +) AC_CHECK_DECLS([strnlen]) # Check for daemon(3), unrelated to --with-daemon (although used by it) diff --git a/src/net.cpp b/src/net.cpp index c51a1b4a74..f83f39a67d 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2167,7 +2167,7 @@ void Discover() } } } -#else +#elif (HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS) // Get local host ip struct ifaddrs* myaddrs; if (getifaddrs(&myaddrs) == 0) |