From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6561 invoked by alias); 10 Oct 2012 09:09:39 -0000 Received: (qmail 6497 invoked by uid 22791); 10 Oct 2012 09:09:28 -0000 X-Spam-Check-By: sourceware.org Received: from aquarius.hirmke.de (HELO calimero.vinschen.de) (217.91.18.234) by sourceware.org (qpsmtpd/0.83/v0.83-20-g38e4449) with ESMTP; Wed, 10 Oct 2012 09:09:23 +0000 Received: by calimero.vinschen.de (Postfix, from userid 500) id 06D822C00B1; Wed, 10 Oct 2012 11:09:21 +0200 (CEST) Date: Wed, 10 Oct 2012 09:09:00 -0000 From: Corinna Vinschen To: cygwin-apps@cygwin.com Subject: Re: [ITA] w32api-3.0b_svn5368-1 Message-ID: <20121010090920.GK6605@calimero.vinschen.de> Reply-To: cygwin-apps@cygwin.com Mail-Followup-To: cygwin-apps@cygwin.com References: <20120814073403.GB13181@calimero.vinschen.de> <20120814075611.GC13181@calimero.vinschen.de> <50322A61.1050806@users.sourceforge.net> <505FE11E.5000401@users.sourceforge.net> <506AABBD.2040600@users.sourceforge.net> <20121009100648.GA5469@calimero.vinschen.de> <1349840892.7960.7.camel@YAAKOV04> <20121010082401.GD6605@calimero.vinschen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20121010082401.GD6605@calimero.vinschen.de> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com X-SW-Source: 2012-10/txt/msg00118.txt.bz2 On Oct 10 10:24, Corinna Vinschen wrote: > On Oct 9 22:48, Yaakov (Cygwin/X) wrote: > > On Tue, 2012-10-09 at 12:06 +0200, Corinna Vinschen wrote: > > > Why does bind include iphlpapi.h at all? As a Cygwin application it's not > > > supposed to use Windows and Cygwin network functions in parallel. > > > > Because you asked me to make it so: > > > > http://www.cygwin.com/ml/cygwin-apps/2009-01/msg00097.html > > Oops, *blush*. > > > So I hacked the code to do exactly that: > > > > http://cygwin-ports.git.sourceforge.net/git/gitweb.cgi?p=cygwin-ports/bind;a=blob;f=9.7.1-lwconfig-win32.patch;h=d05c009 > > > > Perhaps a solution is for cygwin/in.h to #define s_addr s_addr to > > trigger inaddr.h's include guard? > > Will do. But that only helps in your case after we updated to the next > Cygwin version. I guess you already added such a #define to the bind > code? Can you check if my patch to cygwin/in.h works for you? Index: include/cygwin/in.h =================================================================== RCS file: /cvs/src/src/winsup/cygwin/include/cygwin/in.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- include/cygwin/in.h 6 Jul 2012 13:52:18 -0000 1.18 +++ include/cygwin/in.h 10 Oct 2012 08:36:33 -0000 1.19 @@ -112,11 +112,15 @@ enum IPPORT_USERRESERVED = 5000 }; +/* Avoid collision with Mingw64 headers. */ +#ifndef s_addr /* Internet address. */ struct in_addr { in_addr_t s_addr; }; +#define s_addr s_addr +#endif /* Request struct for IPv4 multicast socket ops */ Other than that, was there any other roadblock on the way to the Mingw64 headers? Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Project Co-Leader cygwin AT cygwin DOT com Red Hat