summaryrefslogtreecommitdiff
path: root/compat/win32
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
commitb5c6aac01baf9164e08915b348490710e83119f9 (patch)
tree4099aab13b34925e45a6b57bb0af30288a22739e /compat/win32
parent620b89cd98219db33ce499c7f8e50d091fe9b598 (diff)
parent93d85f57be00859f8adecd474da30a7279cd4ec2 (diff)
downloadgit-b5c6aac01baf9164e08915b348490710e83119f9.zip
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.gz
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.bz2
Merge branch 'rj/msvc-fix'
* rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c
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>