diff -Naur Python-3.7.0-orig/configure.ac Python-3.7.0/configure.ac --- Python-3.7.0-orig/configure.ac 2018-07-12 10:21:10.748335000 +0300 +++ Python-3.7.0/configure.ac 2018-07-12 10:21:17.971147600 +0300 @@ -4217,21 +4217,36 @@ ],[]) AC_MSG_RESULT($was_it_defined) +AC_CHECK_HEADERS([ws2tcpip.h]) AC_MSG_CHECKING(for addrinfo) AC_CACHE_VAL(ac_cv_struct_addrinfo, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[struct addrinfo a]])], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#ifdef HAVE_WS2TCPIP_H +# include +#else +# include +#endif]], + [[struct addrinfo a]])], [ac_cv_struct_addrinfo=yes], [ac_cv_struct_addrinfo=no])) AC_MSG_RESULT($ac_cv_struct_addrinfo) if test $ac_cv_struct_addrinfo = yes; then - AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)]) + AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo]) fi AC_MSG_CHECKING(for sockaddr_storage) AC_CACHE_VAL(ac_cv_struct_sockaddr_storage, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -# include -# include ]], [[struct sockaddr_storage s]])], +#ifdef HAVE_WS2TCPIP_H +#include +#endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif]], + [[struct sockaddr_storage s]])], [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) @@ -5429,7 +5444,10 @@ AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, - [Define to `int' if does not define.]),[ + [Define to `int' if or does not define.]),[ +#ifdef HAVE_WS2TCPIP_H +#include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff -Naur Python-3.7.0-orig/Misc/config_mingw Python-3.7.0/Misc/config_mingw --- Python-3.7.0-orig/Misc/config_mingw 2018-07-12 10:20:50.218698900 +0300 +++ Python-3.7.0/Misc/config_mingw 2018-07-12 10:21:17.971147600 +0300 @@ -10,3 +10,6 @@ # files to ignore ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist ac_cv_file__dev_ptc=no + +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes diff -Naur Python-3.7.0-orig/Modules/socketmodule.c Python-3.7.0/Modules/socketmodule.c --- Python-3.7.0-orig/Modules/socketmodule.c 2018-06-27 06:07:35.000000000 +0300 +++ Python-3.7.0/Modules/socketmodule.c 2018-07-12 10:21:17.971147600 +0300 @@ -387,6 +387,10 @@ /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. */ +#elif defined(__MINGW32__) + /* Do not include addrinfo.h as minimum supported version is + * _WIN32_WINNT >= WindowsXP(0x0501) + */ #else # include "addrinfo.h" #endif diff -Naur Python-3.7.0-orig/pyconfig.h.in Python-3.7.0/pyconfig.h.in --- Python-3.7.0-orig/pyconfig.h.in 2018-07-12 10:20:45.226690100 +0300 +++ Python-3.7.0/pyconfig.h.in 2018-07-12 10:21:17.971147600 +0300 @@ -46,7 +46,7 @@ /* Define to 1 if you have the `acosh' function. */ #undef HAVE_ACOSH -/* struct addrinfo (netdb.h) */ +/* struct addrinfo */ #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ @@ -1261,6 +1261,9 @@ /* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST +/* Define to 1 if you have the header file. */ +#undef HAVE_WS2TCPIP_H + /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY @@ -1573,7 +1576,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t -/* Define to `int' if does not define. */ +/* Define to `int' if or does not define. */ #undef socklen_t /* Define to `int' if doesn't define. */ diff -Naur Python-3.7.0-orig/setup.py Python-3.7.0/setup.py --- Python-3.7.0-orig/setup.py 2018-07-12 10:21:17.534346900 +0300 +++ Python-3.7.0/setup.py 2018-07-12 10:21:17.986747700 +0300 @@ -879,7 +879,11 @@ exts.append( Extension('_posixsubprocess', ['_posixsubprocess.c']) ) # socket(2) + socket_libs = [] + if host_platform.startswith(('mingw', 'win')): + socket_libs += ['ws2_32'] exts.append( Extension('_socket', ['socketmodule.c'], + libraries = socket_libs, depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) ssl_ext, hashlib_ext = self._detect_openssl(inc_dirs, lib_dirs)