Hi guys, On Oct 15 20:57, Kai Tietz wrote: > Patch is ok. Please go ahead and apply. > > Thanks, > Kai > > 2014-10-15 20:14 GMT+02:00 Jacek Caban <ja...@codeweavers.com>: > > For SOCKADDR_INET. > > > > --- > > mingw-w64-headers/include/netioapi.h | 1 + > > 1 file changed, 1 insertion(+)
This patch breaks Cygwin applications using the IP Helper API. iphlpapi.h includes netioapi.h which now includes ws2ipdef.h. See https://cygwin.com/ml/cygwin/2014-12/msg00198.html for a description. Typically we don't want to include ws2ipdef.h and winsock2.h from Cygwin applications becasue Winsock sockets and their definitions collide with Cygwin POSIX sockets and their definitions. The IP helper API needs to be separate. Is it ok to simply revert the patch for Cygwin: diff --git a/mingw-w64-headers/include/netioapi.h b/mingw-w64-headers/include/netioapi.h index 9e7f67d..164f972 100644 --- a/mingw-w64-headers/include/netioapi.h +++ b/mingw-w64-headers/include/netioapi.h @@ -7,7 +7,9 @@ #define _INC_NETIOAPI #include <ws2def.h> +#ifndef __CYGWIN__ #include <ws2ipdef.h> +#endif #include <iprtrmib.h> #include <ifdef.h> #include <ntddndis.h> Thanks, Corinna
pgpsiDHGYUdB4.pgp
Description: PGP signature
------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
