diff --git a/src/channel.c b/src/channel.c index 5d45ac6d1..cdb956e7c 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 f0ec4bc2d..1c528a30a 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1692, /**/ 1691, /**/