@matheusbsbs / matheus-bagliano / commits / 56fb3ddc89
Fork 0

msvc: Fix compilation errors in compat/win32/sys/poll.c

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> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramsay Jones committed Dec 4, 2010 at 18:54 UTC 56fb3ddc89ab94c8b09d178a848cb553b4acf777
1 file changed +3
compat/win32/sys/poll.c
+3
@@ -34,6 +34,9 @@
34
35 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
36 # define WIN32_NATIVE
37 +# if defined (_MSC_VER)
38 +# define _WIN32_WINNT 0x0502
39 +# endif
40 # include <winsock2.h>
41 # include <windows.h>
42 # include <io.h>