Merge branch 'jk/maint-config-alias-fix'

diff --git a/compat/win32/sys/poll.c b/compat/win32/sys/poll.c
index 092d05e6bd617a7b27afb777783f892ba78cfefd..708a6c9bec5c04cd95861b77475e54445c0d24fc 100644 (file)
--- a/compat/win32/sys/poll.c
+++ b/compat/win32/sys/poll.c
@@ -24,8 +24,7 @@
 # pragma GCC diagnostic ignored "-Wtype-limits"
 #endif
 
-#include <config.h>
-#include <alloca.h>
+#include <malloc.h>
 
 #include <sys/types.h>
 #include "poll.h"
@@ -35,6 +34,9 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # define WIN32_NATIVE
+# if defined (_MSC_VER)
+#  define _WIN32_WINNT 0x0502
+# endif
 # include <winsock2.h>
 # include <windows.h>
 # include <io.h>