MSVC: fix poll-related macro redefines

kusma · dscho · commit 9ca803910f36 · 2011-11-04T13:41:04.000-05:00
This seems to be related to the poll-emulation... I see that these things
are guarded by an "#if(_WIN32_WINNT &gt;= 0x0600)" in &lt;winsock2.h&gt;, which
means it's supported for Windows Vista and above... We still support
Windows XP, so it seems someone has set this too high :)

I'd prefer to set this from the Makefile, but this generates a warning in
compat/win32/poll.c about redefining a macro (poll.c wants it to be 0x502,
which is Windows XP with SP2, rather than 0x501 which is normal Windows
XP).

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -1,3 +1,4 @@
+#define _WIN32_WINNT 0x0501
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -85,6 +85,7 @@
 #define _SGI_SOURCE 1
 
 #ifdef WIN32 /* Both MinGW and MSVC */
+#define _WIN32_WINNT 0x0501
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>
 #include <windows.h>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#define _WIN32_WINNT 0x0501`
`1`	`2`	`#include <winsock2.h>`
`2`	`3`	`#include <ws2tcpip.h>`
`3`	`4`