[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 bd52f37: ; Fix last change: only MinGW runtime 5.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 bd52f37: ; Fix last change: only MinGW runtime 5.0.2 and later needs that. |
Date: |
Sat, 28 Jul 2018 10:23:12 -0400 (EDT) |
branch: emacs-26
commit bd52f37cae3fbc25e576f9b0a1ba42596790965f
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
; Fix last change: only MinGW runtime 5.0.2 and later needs that.
---
lib-src/pop.c | 2 +-
nt/inc/ms-w32.h | 2 +-
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 0b92045..731f951 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 0ab46e9..d15b6da 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 3ea9542..de282c4 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>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 bd52f37: ; Fix last change: only MinGW runtime 5.0.2 and later needs that.,
Eli Zaretskii <=