Re: [PATCH] Update cygwin.c for new mingw-64 win32 api headers

From: Jeff King <peff@peff.net>
Date: Nov 12, 2012, 20:58 UTC
Message-ID: <20121112205832.GI4623@sigill.intra.peff.net>
In-Reply-To: <1352679440-4098-1-git-send-email-mlevedahl@gmail.com>

On Sun, Nov 11, 2012 at 07:17:20PM -0500, Mark Levedahl wrote:

Show 10 quoted lines

> The cygwin project recently switched to a new implementation of the
> windows api, now using header files from the mingw-64 project. These
> new header files are incompatible with the way cygwin.c included the
> old headers: cygwin.c can be compiled using the new or the older (mingw)
> headers, but different files must be included in different order for each
> to work. The new headers are in use only for the current release series
> (based upon the v1.7.x dll version). The previous release series using
> the v1.5 dll is kept available but unmaintained for use on older versions
> of Windows. So, patch cygwin.c to use the new include ordering only if
> the dll version is 1.7 or higher.

I have very little knowledge of cygwin compatibility, so thanks for a nice explanation. I'll queue it in 'pu' for now, and hopefully we can get some test reports from other cygwin folks (on new and old cygwin).

Show 10 quoted lines

> diff --git a/Makefile b/Makefile
> index f69979e..1cc5d96 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1082,6 +1082,7 @@ ifeq ($(uname_O),Cygwin)
>  		NO_SYMLINK_HEAD = YesPlease
>  		NO_IPV6 = YesPlease
>  		OLD_ICONV = UnfortunatelyYes
> +		V15_MINGW_HEADERS = YesPlease
>  	endif

The "if" part of the conditional that did not make it into the context above is an expr match for "1.6.*" From the name, I would think that we would want to use these headers on cygwin 1.5.* , too. Is v1.5 too old to care about now?

-Peff