diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-07-28 17:21:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-07-28 17:21:53 +0300 |
| commit | bd52f37cae3fbc25e576f9b0a1ba42596790965f (patch) | |
| tree | e86b9a18ecaaa235a8e11023a9169b52f9656986 /nt | |
| parent | 024d20f81e643fe1739d28d16501a8c4f7a860c6 (diff) | |
| download | emacs-bd52f37cae3fbc25e576f9b0a1ba42596790965f.tar.gz | |
; Fix last change: only MinGW runtime 5.0.2 and later needs that.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/ms-w32.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 |
2 files changed, 2 insertions, 2 deletions
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> |