summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2013-09-11 18:06:31 +0200
committerJunio C Hamano <gitster@pobox.com>2013-09-11 14:50:19 -0700
commit8453c1259a3b6fe89d67b6e783cc535b60f298c1 (patch)
treef06c9244e55b0afee23996918b64bad836cac3aa /compat
parentfa93bb20d72edf9f7635c63d46101edb206d3d6f (diff)
downloadgit-8453c1259a3b6fe89d67b6e783cc535b60f298c1.tar.gz
Windows: do not redefine _WIN32_WINNTkb/msvc-compile
With MinGW runtime version 4.0 this interferes with the previous definition from sdkddkver.h. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/nedmalloc/malloc.c.h2
-rw-r--r--compat/poll/poll.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index ed4f1fa5af..f216a2a7d3 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -499,7 +499,9 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP
#endif /* WIN32 */
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
+#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x403
+#endif
#include <windows.h>
#define HAVE_MMAP 1
#define HAVE_MORECORE 0
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 44103103a4..31163f2ae7 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -39,7 +39,7 @@
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# define WIN32_NATIVE
-# if defined (_MSC_VER)
+# if defined (_MSC_VER) && !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0502
# endif
# include <winsock2.h>