summaryrefslogtreecommitdiff
path: root/compat/nedmalloc
diff options
context:
space:
mode:
authorLibravatar Sebastian Schuberth <sschuberth@gmail.com>2013-09-11 18:06:31 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-11 14:50:19 -0700
commit8453c1259a3b6fe89d67b6e783cc535b60f298c1 (patch)
treef06c9244e55b0afee23996918b64bad836cac3aa /compat/nedmalloc
parentMinGW: Fix stat definitions to work with MinGW runtime version 4.0 (diff)
downloadtgif-8453c1259a3b6fe89d67b6e783cc535b60f298c1.tar.xz
Windows: do not redefine _WIN32_WINNT
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/nedmalloc')
-rw-r--r--compat/nedmalloc/malloc.c.h2
1 files changed, 2 insertions, 0 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