diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/channel.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c index 5d45ac6d14..cdb956e7cf 100644 --- a/src/channel.c +++ b/src/channel.c @@ -926,7 +926,9 @@ channel_open( CLEAR_FIELD(hints); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; -# if defined(AI_ADDRCONFIG) && defined(AI_V4MAPPED) +# if defined(__ANDROID__) + hints.ai_flags = AI_ADDRCONFIG; +# elif defined(AI_ADDRCONFIG) && defined(AI_V4MAPPED) hints.ai_flags = AI_ADDRCONFIG | AI_V4MAPPED; # endif // Set port number manually in order to prevent name resolution services diff --git a/src/version.c b/src/version.c index f0ec4bc2d1..1c528a30a9 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1692, +/**/ 1691, /**/ 1690, |