From: Vincent van Ravesteijn Date: Fri, 18 Nov 2011 16:44:29 GMT Subject: [PATCH 2/3] Compile fix for MSVC: fix poll-related macro redefines Message-ID: <1321634670-4968-2-git-send-email-vfr@lyx.org> In-Reply-To: <1321634670-4968-1-git-send-email-vfr@lyx.org> This seems to be related to the poll-emulation... I see that these things are guarded by an "#if(_WIN32_WINNT >= 0x0600)" in , 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). Proposed-by: Erik Faye-Lund Signed-off-by: Johannes Schindelin Submitted-by: Vincent van Ravesteijn --- compat/mingw.h | 1 + git-compat-util.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index fecf0d0..ff18401 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -1,3 +1,4 @@ +#define _WIN32_WINNT 0x0501 #include #include diff --git a/git-compat-util.h b/git-compat-util.h index 5ef8ff7..76cbfe6 100644 --- 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 #include -- 1.7.4.1