Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:21
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC · Sebastian Schuberth <hidden>
- 2016-06-15 · Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC · Pat Thoyts <hidden>
- 2016-06-15 · Re: [msysGit] Re: [PATCHv2] Compile fix for MSVC · Vincent van Ravesteijn <hidden>
Erik Faye-Lund [off-list ref] writes:
This is a slip-up in my patch 0f77dea, but I don't quite understand why this didn't cause any troubles until now... I guess the MSVC parts of Makefile are somehow more dependent on LIB_H or something... Junio, is it too late to squash in a fix-up? If it is, I can send a fixup-patch instead...
I can queue this for v1.7.8-rc1 if you want, as it is a fix whether or not we define MSVC or not while building. -- >8 -- From: Erik Faye-Lund <redacted> Date: Tue, 1 Nov 2011 12:56:21 +0100 Subject: [PATCH] mingw: poll.h is no longer in sys/ Earlier we moved this header file in the code but forgot to update the Makefile that refers to it. Signed-off-by: Junio C Hamano <redacted> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 4c09b35..ee34eab 100644
--- a/Makefile
+++ b/Makefile@@ -515,7 +515,7 @@ LIB_H += compat/mingw.h LIB_H += compat/obstack.h LIB_H += compat/win32/pthread.h LIB_H += compat/win32/syslog.h -LIB_H += compat/win32/sys/poll.h +LIB_H += compat/win32/poll.h LIB_H += compat/win32/dirent.h LIB_H += connected.h LIB_H += csum-file.h
--
1.7.8.rc0.88.g45c5be
> Anyway, with that fix in place, it still breaks here:
> ...
> Again, this seems to be related to the poll-emulation... I see that
> these things are guarded by an "#if(_WIN32_WINNT >= 0x0600)" in
> <winsock2.h>, which means it's supported for Windows Vista and
> above... We still support Windows XP, so it seems someone has set this
> too high :)
> ...
> And THEN it compiles fine from 'devel'.
>
> So there's some more work left to be done. Unfortunately, I don't have
> time to polish these changes for at least a week, so unless someone
> volunteers it'll take some time...
It seems, from your description, that msvc update series has some way to
go and it probably is better to be cooked by Windows-savvy folks for
another cycle. Which would mean that your upload-archive series is still
good to go as long as it works for non-MSVC/mingw people, right?