diff options
| -rw-r--r-- | lib-src/pop.c | 2 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/pop.c b/lib-src/pop.c index 0b9204576bd..731f951fd14 100644 --- 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 0ab46e98328..d15b6da1a74 100644 --- 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 3ea9542b05c..de282c467e6 100644 --- 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> |