From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Cc: Karsten Blees <karsten.blees@gmail.com>
Subject: [PATCH] Windows: Do not redefine _WIN32_WINNT
Date: Wed, 11 Sep 2013 18:06:31 +0200 [thread overview]
Message-ID: <52309507.1090908@gmail.com> (raw)
With MinGW runtime version 4.0 this interferes with the previous definition
from sdkddkver.h.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
compat/nedmalloc/malloc.c.h | 2 ++
git-compat-util.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index 1401a67..930d03b 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -495,7 +495,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/git-compat-util.h b/git-compat-util.h
index 664305c..f5c756d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -93,7 +93,9 @@
#undef __NO_INLINE__
#ifdef WIN32 /* Both MinGW and MSVC */
+#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0502
+#endif
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
#include <winsock2.h>
#include <windows.h>
--
1.8.3.mingw.1.2.g56240b5.dirty
next reply other threads:[~2013-09-11 16:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 16:06 Sebastian Schuberth [this message]
2013-09-11 18:29 ` [PATCH] Windows: Do not redefine _WIN32_WINNT Junio C Hamano
2013-09-11 20:03 ` Sebastian Schuberth
2013-09-11 21:51 ` Junio C Hamano
2013-09-12 8:41 ` Sebastian Schuberth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52309507.1090908@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=karsten.blees@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).