diff options
| author | Stefan Krah <skrah@bytereef.org> | 2016-05-22 17:35:34 +0200 |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2016-05-22 17:35:34 +0200 |
| commit | 1f9eb879d573454cd3ea321993e72ad2cca65c9d (patch) | |
| tree | a21cabb1c4c14164fe51eba30ee5c0747705457c | |
| parent | 70b49f60f41ef94825ab5293dba7e0d0b88ccd41 (diff) | |
| download | cpython-git-1f9eb879d573454cd3ea321993e72ad2cca65c9d.tar.gz | |
Issue #26857: The gethostbyaddr_r() workaround is no longer needed with
api-level >= 23. Patch by Xavier de Gaye.
| -rw-r--r-- | Include/pyport.h | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index 66e00d4e6d..8b0a89f249 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -897,4 +897,8 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler; #endif /* _MSC_VER >= 1900 */ #endif /* Py_BUILD_CORE */ +#ifdef __ANDROID__ +#include <android/api-level.h> +#endif + #endif /* Py_PYPORT_H */ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 46eeed1ab9..dc57810a07 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -163,7 +163,11 @@ if_indextoname(index) -- return the corresponding interface name\n\ # include <sys/uio.h> #endif -#if !defined(WITH_THREAD) || defined(__ANDROID__) +#if !defined(WITH_THREAD) +# undef HAVE_GETHOSTBYNAME_R +#endif + +#if defined(__ANDROID__) && __ANDROID_API__ < 23 # undef HAVE_GETHOSTBYNAME_R #endif |