diff options
| author |  Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2013-01-31 18:28:35 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-25 12:39:56 -0800 |
| commit | 41f2999180f5a58f2a4214d896359c1587c9024f (patch) | |
| tree | c07fe18fe51bd56218d49e3a32c0ae85810314da | |
| parent | Git 1.8.2-rc1 (diff) | |
| download | tgif-41f2999180f5a58f2a4214d896359c1587c9024f.tar.xz | |
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>
| -rw-r--r-- | compat/vcbuild/include/sys/poll.h | 1 | ||||
| -rw-r--r-- | git-compat-util.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/compat/vcbuild/include/sys/poll.h b/compat/vcbuild/include/sys/poll.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/poll.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/git-compat-util.h b/git-compat-util.h index b7eaaa99a8..490afb6af4 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -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> |