mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
msvc: Fix compilation errors caused by poll.h emulation
Commit0f77dea9
("mingw: move poll out of sys-folder", 24-10-2011), along with other commits in the 'ef/mingw-upload-archive' branch (see commit7406aa20
), effectively reintroduced the same problem addressed by commit56fb3ddc
("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>
This commit is contained in:
parent
4dac0679fe
commit
41f2999180
@ -1 +0,0 @@
|
||||
/* Intentionally empty file to support building git with MSVC */
|
@ -86,6 +86,9 @@
|
||||
#define _SGI_SOURCE 1
|
||||
|
||||
#ifdef WIN32 /* Both MinGW and MSVC */
|
||||
# if defined (_MSC_VER)
|
||||
# define _WIN32_WINNT 0x0502
|
||||
# endif
|
||||
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
|
Loading…
Reference in New Issue
Block a user