Commit bd52f37c authored by Eli Zaretskii's avatar Eli Zaretskii

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

parent 024d20f8
...@@ -30,7 +30,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ ...@@ -30,7 +30,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include "ntlib.h" #include "ntlib.h"
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 /* for getaddrinfo stuff */ #define _WIN32_WINNT 0x0501 /* for getaddrinfo stuff */
#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000000L #if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L
# include <windows.h> # include <windows.h>
#else #else
# include <winsock2.h> # include <winsock2.h>
......
...@@ -455,7 +455,7 @@ extern char *get_emacs_configuration_options (void); ...@@ -455,7 +455,7 @@ extern char *get_emacs_configuration_options (void);
windows.h. For this to have proper effect, config.h must always be windows.h. For this to have proper effect, config.h must always be
included before windows.h. */ included before windows.h. */
#define _WINSOCKAPI_ 1 #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, /* 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, and now defining _WINSOCK_H skips the definition of struct timeval,
which we don't want. */ which we don't want. */
......
...@@ -49,7 +49,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ ...@@ -49,7 +49,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#define timeval ws_timeval #define timeval ws_timeval
#endif #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, /* Need winerror.h before winsock2.h with mingw.org's MinGW 5.x,
otherwise some error codes are not defined. */ otherwise some error codes are not defined. */
# include <winerror.h> # include <winerror.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment