threads / patch / 32084

patchUpdate cygwin.c for new mingw-64 win32 api headers

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

## tl;dr

4 messages between Nov 12, 2012 and Nov 12, 2012. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Mark Levedahl· Nov 12, 2012, 00:17 UTC · lore

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.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 Makefile        | 4 ++++
 compat/cygwin.c | 7 +++++++
 2 files changed, 11 insertions(+)
Show changes to 2 files +11 −0

Makefile, compat/cygwin.c

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
 	NO_THREAD_SAFE_PREAD = YesPlease
 	NEEDS_LIBICONV = YesPlease
@@ -1889,6 +1890,9 @@ ifdef NO_REGEX
 	COMPAT_CFLAGS += -Icompat/regex
 	COMPAT_OBJS += compat/regex/regex.o
 endif
+ifdef V15_MINGW_HEADERS
+	COMPAT_CFLAGS += -DV15_MINGW_HEADERS
+endif
 
 ifdef USE_NED_ALLOCATOR
        COMPAT_CFLAGS += -Icompat/nedmalloc
diff --git a/compat/cygwin.c b/compat/cygwin.c
index dfe9b30..59d86e4 100644
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -1,6 +1,13 @@
 #define WIN32_LEAN_AND_MEAN
+#ifdef V15_MINGW_HEADERS
 #include "../git-compat-util.h"
 #include "win32.h"
+#else
+#include <sys/stat.h>
+#include <sys/errno.h>
+#include "win32.h"
+#include "../git-compat-util.h"
+#endif
 #include "../cache.h" /* to read configuration */
 
 static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)

-- 
1.8.0.0.0.14
Jeff King· Nov 12, 2012, 20:58 UTC · re: Mark Levedahl · lore

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

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
Mark Levedahl· Nov 12, 2012, 21:39 UTC · re: Jeff King · lore

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

On Mon, Nov 12, 2012 at 3:58 PM, Jeff King <peff@peff.net> wrote:
Show 34 quoted lines
> On Sun, Nov 11, 2012 at 07:17:20PM -0500, Mark Levedahl wrote:
>
>> 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).
>
>> 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
The opening if expression is:
    ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4)
which I believe matches any version below 1.7. 1.5 is what is released
opensource, 1.6 is (or was) available as a supported product from
redhat. So, I think the stanza is ok as is.
Mark
Jeff King· Nov 12, 2012, 21:43 UTC · re: Mark Levedahl · lore

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

On Mon, Nov 12, 2012 at 04:39:39PM -0500, Mark Levedahl wrote:
Show 21 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?
> 
> The opening if expression is:
>     ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4)
> which I believe matches any version below 1.7. 1.5 is what is released
> opensource, 1.6 is (or was) available as a supported product from
> redhat. So, I think the stanza is ok as is.

Oh, right, I'm an idiot. I read the patch, thought "gee, I wonder what that conditional just outside the context is", looked it up, then promptly misremembered exactly what it said when writing the rest of my email.

Yes, what you have is absolutely right. Sorry for the noise.
-Peff

← back to recent threads