; Fix last change: only MinGW runtime 5.0.2 and later needs that.

diff --git a/lib-src/pop.c b/lib-src/pop.c
index 0b9204576bd8d0afbc60b06c11021e0920541fde..731f951fd1489f49f5d6f026aba4a48afd588fec 100644 (file)
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -30,7 +30,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "ntlib.h"
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501    /* for getaddrinfo stuff */
-#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000000L
+#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L
 # include <windows.h>
 #else
 # include <winsock2.h>

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 0ab46e98328b265a6da5c1871b017afd9cd31b7f..d15b6da1a742174c233be23ff15aab38a443a0a0 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -455,7 +455,7 @@ extern char *get_emacs_configuration_options (void);
    windows.h.  For this to have proper effect, config.h must always be
    included before windows.h.  */
 #define _WINSOCKAPI_    1
-#if defined __MINGW32_VERSION && __MINGW32_VERSION < 5000000L
+#if !(defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L)
 /* mingw.org's MinGW 5.x changed how it includes winsock.h and time.h,
    and now defining _WINSOCK_H skips the definition of struct timeval,
    which we don't want.  */

diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 3ea9542b05c57d7ee7f20e5ec6d9f303219daa59..de282c467e6f6b21109c3b44a5cc52c3d0581391 100644 (file)
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -49,7 +49,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #define timeval ws_timeval
 #endif
 
-#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000000L
+#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L
 /* Need winerror.h before winsock2.h with mingw.org's MinGW 5.x,
    otherwise some error codes are not defined.  */
 # include <winerror.h>