summaryrefslogtreecommitdiff
path: root/git-compat-util.h
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 /git-compat-util.h
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 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 9549de6318..7776f126d3 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -86,7 +86,7 @@
#define _SGI_SOURCE 1
#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
-# if defined (_MSC_VER)
+# if defined (_MSC_VER) && !defined(_WIN32_WINNT)
# define _WIN32_WINNT 0x0502
# endif
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */