On 06.01.13 20:54, Junio C Hamano wrote: > Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > >> Mark Levedahl wrote: >> >>> However, the newer >>> win32api is provided only for the current cygwin release series, which can >>> be reliably identified by having dll version 1.7.x, while the older frozen >>> releases (dll versions 1.6.x from redhat, 1.5.x open source) still have the >>> older api as no updates are being made for the legacy version(s). >> >> Ah. That makes sense, thanks. >> >> (For the future, if we wanted to diagnose an out-of-date win32api and >> print a helpful message, I guess cygcheck would be the command to use.) > > Hmph, so we might see somebody who cares about Cygwin to come up > with a solution based on cygcheck (not on uname) to update this > part, perhaps on top of Peff's "split default settings based on > uname into separate file" patch? > > If I understood what Mark and Torsten wrote correctly, you will have > the new win32api if you install 1.7.17 (or newer) from scratch, but > if you are on older 1.7.x then you can update the win32api part as a > package update (as opposed to the whole-system upgrade). A test > based on "uname -r" cannot notice that an older 1.7.x (say 1.7.14) > installation has a newer win32api because the user updated it from > the package (hence the user should not define CYGWIN_V15_WIN32API). > > Am I on the same page as you guys, or am I still behind? > > In the meantime, perhaps we would need something like this? > > > diff --git a/Makefile b/Makefile > index 8e225ca..b45b06d 100644 > --- a/Makefile > +++ b/Makefile > @@ -281,6 +281,9 @@ all:: > # > # Define NO_REGEX if you have no or inferior regex support in your C library. > # > +# Define CYGWIN_V15_WIN32API if your Cygwin uses win32api dll older than > +# 1.7.x (this typically is true on Cygwin older than 1.7.17) > +# > # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the > # user. > # Hm, I haven't understood the connection between the dll (cygwin1.dll ?) which is used in runtime, and the header files which are used when compiling. Are they updated at the same time when updating from 1.7.16 to 1.7.17 ? Until I updated my cygwin 1.7 (following Marks recommendation) this did the trick for me: +ifeq ($(shell grep mingw /usr/include/w32api/winsock2.h />/dev/null 2>/dev/null && echo y),y) + CYGWIN_V15_WIN32API=YesPlease +endif As an alternative, would this be easier to read? > +# Define CYGWIN_V15_WIN32API for Cygwin versions up to 1.7.16 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html