@matheusbsbs / matheus-bagliano / commits / 41f2999180

msvc: Fix compilation errors caused by poll.h emulation

Commit 0f77dea9 ("mingw: move poll out of sys-folder", 24-10-2011), along with other commits in the 'ef/mingw-upload-archive' branch (see commit 7406aa20), effectively reintroduced the same problem addressed by commit 56fb3ddc ("msvc: Fix compilation errors in compat/win32/sys/poll.c", 04-12-2010). In order to fix the compilation errors, we use the same solution adopted in that earlier commit. In particular, we set _WIN32_WINNT to 0x0502 (which would target Windows Server 2003) prior to including the winsock2.h header file. Also, we delete the compat/vcbuild/include/sys/poll.h header file, since it is now redundant and it's presence may cause some confusion. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramsay Jones committed Jan 31, 2013 at 18:28 UTC 41f2999180f5a58f2a4214d896359c1587c9024f
2 files changed +3 -1
compat/vcbuild/include/sys/poll.h deleted
-1
@@ -1 +0,0 @@
1 -/* Intentionally empty file to support building git with MSVC */
git-compat-util.h
+3
@@ -86,6 +86,9 @@
86 #define _SGI_SOURCE 1
87
88 #ifdef WIN32 /* Both MinGW and MSVC */
89 +# if defined (_MSC_VER)
90 +# define _WIN32_WINNT 0x0502
91 +# endif
92 #define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
93 #include <winsock2.h>
94 #include <windows.h>