From: Erik Faye-Lund <kusmabite@gmail.com>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH 01/14] msvc: Fix compilation errors in compat/win32/sys/poll.c
Date: Sat, 4 Dec 2010 22:12:24 +0100 [thread overview]
Message-ID: <AANLkTinDoeYarLQLtZ327a7Us0cvaN42NFCoYorwMsT-@mail.gmail.com> (raw)
In-Reply-To: <4CFA8E64.6070402@ramsay1.demon.co.uk>
On Sat, Dec 4, 2010 at 7:54 PM, Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:
>
> The msvc winsock2.h header file conditionally defines or declares
> poll() related symbols which cause many macro redefinition errors,
> a struct type redefinition error and syntax errors. These symbols
> are defined in support of the WSAPoll() API, new in Windows Vista,
> when the symbol _WIN32_WINNT is defined and _WIN32_WINNT >= 0x0600.
>
> In order to avoid the compilation errors, we set _WIN32_WINNT to
> 0x0502 (which would target Windows Server 2003) prior to including
> the winsock2.h header file.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
> compat/win32/sys/poll.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/compat/win32/sys/poll.c b/compat/win32/sys/poll.c
> index 7e74ebe..708a6c9 100644
> --- a/compat/win32/sys/poll.c
> +++ b/compat/win32/sys/poll.c
> @@ -34,6 +34,9 @@
>
> #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
> # define WIN32_NATIVE
> +# if defined (_MSC_VER)
> +# define _WIN32_WINNT 0x0502
> +# endif
> # include <winsock2.h>
> # include <windows.h>
> # include <io.h>
I have an almost identical patch in my msvc-tree, so FWIW:
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
next prev parent reply other threads:[~2010-12-04 21:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-04 18:54 [PATCH 01/14] msvc: Fix compilation errors in compat/win32/sys/poll.c Ramsay Jones
2010-12-04 20:45 ` Jonathan Nieder
2010-12-07 22:54 ` Ramsay Jones
2010-12-04 21:12 ` Erik Faye-Lund [this message]
2010-12-04 21:22 ` Johannes Sixt
2010-12-08 0:18 ` Ramsay Jones
2010-12-08 19:42 ` Johannes Sixt
[not found] ` <4D039E73.80301@ramsay1.demon.co.uk>
2010-12-11 22:09 ` Johannes Sixt
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=AANLkTinDoeYarLQLtZ327a7Us0cvaN42NFCoYorwMsT-@mail.gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=ramsay@ramsay1.demon.co.uk \
/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).