This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [ITA] w32api-3.0b_svn5368-1


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]