Re: [PATCH 01/14] msvc: Fix compilation errors in compat/win32/sys/poll.c
On Samstag, 4. Dezember 2010, Ramsay Jones wrote:
Show 29 quoted lines
> 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>
Don't you have to do the same in git-compat-util.h?
-- Hannes