summaryrefslogtreecommitdiff
path: root/compat/win32
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-12-04 18:54:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-09 19:13:55 (GMT)
commit56fb3ddc89ab94c8b09d178a848cb553b4acf777 (patch)
treeca56184ca96d75d684fa743c5839cc764176d116 /compat/win32
parent89ba4e7c7f71712133d1d3137f811b99ea43dd31 (diff)
downloadgit-56fb3ddc89ab94c8b09d178a848cb553b4acf777.zip
git-56fb3ddc89ab94c8b09d178a848cb553b4acf777.tar.gz
git-56fb3ddc89ab94c8b09d178a848cb553b4acf777.tar.bz2
msvc: Fix compilation errors in compat/win32/sys/poll.c
The msvc winsock2.h header file conditionally defines or declares poll() related symbols which cause many macro redefinition errors, a struct type redefinition error and syntax errors. These symbols are defined in support of the WSAPoll() API, new in Windows Vista, when the symbol _WIN32_WINNT is defined and _WIN32_WINNT >= 0x0600. In order to avoid the compilation errors, we set _WIN32_WINNT to 0x0502 (which would target Windows Server 2003) prior to including the winsock2.h header file. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/win32')
-rw-r--r--compat/win32/sys/poll.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/compat/win32/sys/poll.c b/compat/win32/sys/poll.c
index 7e74ebe..708a6c9 100644
--- a/compat/win32/sys/poll.c
+++ b/compat/win32/sys/poll.c
@@ -34,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>