difftool: make --gui, --tool and --extcmd mutually exclusive

diff --git a/git-compat-util.h b/git-compat-util.h
index 5f2e90932f9990419d75d803d9552acf2f14adef..48c955541e2000239f861bdf7dd5043fa741674c 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -146,8 +146,8 @@
 #define _SGI_SOURCE 1
 
 #if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
-# if defined (_MSC_VER) && !defined(_WIN32_WINNT)
-#  define _WIN32_WINNT 0x0502
+# if !defined(_WIN32_WINNT)
+#  define _WIN32_WINNT 0x0600
 # endif
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>