Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)

From: Torsten Bögershausen <tboegi@web.de>
Date: Nov 13, 2012, 20:45 UTC
Message-ID: <50A2B14C.9040608@web.de>
In-Reply-To: <20121113175205.GA26960@sigill.intra.peff.net>

Show 6 quoted lines

> * ml/cygwin-mingw-headers (2012-11-12) 1 commit
>  - Update cygwin.c for new mingw-64 win32 api headers
> 
>  Make git work on newer cygwin.
> 
>  Will merge to 'next'.

(Sorry for late answer, I managed to test the original patch minutes before Peff merged it to pu) (And thanks for maintaining git)

Is everybody using cygwin happy with this?

I managed to compile on a fresh installed cygwin, but failed to compile under 1.7.7, see below. Is there a way we can achieve to compile git both under "old" and "new" cygwin 1.7 ? Or is this not worth the effort? /Torsten

    CC compat/cygwin.o
In file included from compat/../git-compat-util.h:90,
                 from compat/cygwin.c:9:
/usr/lib/gcc/i686-pc-cygwin/3.4.4/../../../../include/w32api/winsock2.h:103:2: warning: #warning "fd_set and associated macros have been defined in sys/types.      This may cause runtime problems with W32 sockets"
In file included from /usr/include/sys/socket.h:16,
                 from compat/../git-compat-util.h:131,
                 from compat/cygwin.c:9:
/usr/include/cygwin/socket.h:29: error: redefinition of `struct sockaddr'
/usr/include/cygwin/socket.h:41: error: redefinition of `struct sockaddr_storage'
In file included from /usr/include/sys/socket.h:16,
                 from compat/../git-compat-util.h:131,
                 from compat/cygwin.c:9:
/usr/include/cygwin/socket.h:59: error: redefinition of `struct linger'
In file included from compat/../git-compat-util.h:131,
                 from compat/cygwin.c:9:
/usr/include/sys/socket.h:30: error: conflicting types for 'accept'
/usr/lib/gcc/i686-pc-cygwin/3.4.4/../../../../include/w32api/winsock2.h:536: error: previous declaration of 'accept' was here