cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Denis Excoffier]

Hello,

In order to successfully build cygwin-2.0.2-1 (for x86, both XP and W7) i had to apply
the following patch (below). No such problem with cygwin-2.0.1-1.

Regards,

Denis Excoffier


diff -uNr newlib-cygwin-o/winsup/cygwin/net.cc newlib-cygwin-p/winsup/cygwin/net.cc
--- newlib-cygwin-o/winsup/cygwin/net.cc	2015-05-08 23:51:08.000000000 +0200
+++ newlib-cygwin-p/winsup/cygwin/net.cc	2015-05-11 10:12:57.816299800 +0200
@@ -2444,7 +2444,7 @@
   return -1;
 }
 
-extern "C" unsigned
+extern "C" NET_IFINDEX
 if_nametoindex (const char *name)
 {
   PIP_ADAPTER_ADDRESSES pa0 = NULL, pap;
@@ -2478,7 +2478,7 @@
 }
 
 extern "C" char *
-if_indextoname (unsigned ifindex, char *ifname)
+if_indextoname (NET_IFINDEX ifindex, char *ifname)
 {
   PIP_ADAPTER_ADDRESSES pa0 = NULL, pap;
   char *name = NULL;


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

Re: cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Takashi Yano]

On Mon, 11 May 2015 17:52:04 +0200
Denis Excoffier wrote:

> In order to successfully build cygwin-2.0.2-1 (for x86, both XP and W7) i had to apply
> the following patch (below). No such problem with cygwin-2.0.1-1.

In my case, the same problem is caused by upgrading
w32api-headers to 4.0.2-1. It does not result from
difference between cygwin-2.0.2-1 and cygwin-2.0.1-1.

-- 
Takashi Yano <takashi.yano@nifty.ne.jp>

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

Re: cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Takashi Yano]

On Thu, 21 May 2015 20:15:09 +0900
Takashi Yano <takashi.yano@nifty.ne.jp> wrote:

> On Mon, 11 May 2015 17:52:04 +0200
> Denis Excoffier wrote:
> 
> > In order to successfully build cygwin-2.0.2-1 (for x86, both XP and W7) i had to apply
> > the following patch (below). No such problem with cygwin-2.0.1-1.
> 
> In my case, the same problem is caused by upgrading
> w32api-headers to 4.0.2-1. It does not result from
> difference between cygwin-2.0.2-1 and cygwin-2.0.1-1.

I have looked into this problem. The cause is as follows.

netioapi.h in w32api-headers 3.3.0-2 was using a macro-name
_INC_NETIOAPI for include-guard. By defining _INC_NETIOAPI,
net.cc avoids including netioapi.h, which conflicts with
if_nametoindex() and if_indextoname() in it.

However, the macro-name for include-guard in netioapi.h of
w32api-headers 4.0.2-1 has been changed to _NETIOAPI_H_.

As a result, net.cc fails to avoid including netioapi.h,
which causes confliction.

Thus, defining _NETIOAPI_H_ in net.cc resolves the problem.


diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index eaf6eb8..d6a631b 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -19,6 +19,7 @@ details. */
    TODO:  Convert if_nametoindex to cygwin_if_nametoindex and call
 	  system functions on Vista and later. */
 #define _INC_NETIOAPI
+#define _NETIOAPI_H_
 #include "winsup.h"
 #ifdef __x86_64__
 /* 2014-04-24: Current Mingw headers define sockaddr_in6 using u_long (8 byte)


-- 
Takashi Yano <takashi.yano@nifty.ne.jp>

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

Re: cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 1827 bytes --]

On May 22 19:37, Takashi Yano wrote:
> On Thu, 21 May 2015 20:15:09 +0900
> Takashi Yano <takashi.yano@nifty.ne.jp> wrote:
> 
> > On Mon, 11 May 2015 17:52:04 +0200
> > Denis Excoffier wrote:
> > 
> > > In order to successfully build cygwin-2.0.2-1 (for x86, both XP and W7) i had to apply
> > > the following patch (below). No such problem with cygwin-2.0.1-1.
> > 
> > In my case, the same problem is caused by upgrading
> > w32api-headers to 4.0.2-1. It does not result from
> > difference between cygwin-2.0.2-1 and cygwin-2.0.1-1.
> 
> I have looked into this problem. The cause is as follows.
> 
> netioapi.h in w32api-headers 3.3.0-2 was using a macro-name
> _INC_NETIOAPI for include-guard. By defining _INC_NETIOAPI,
> net.cc avoids including netioapi.h, which conflicts with
> if_nametoindex() and if_indextoname() in it.
> 
> However, the macro-name for include-guard in netioapi.h of
> w32api-headers 4.0.2-1 has been changed to _NETIOAPI_H_.
> 
> As a result, net.cc fails to avoid including netioapi.h,
> which causes confliction.
> 
> Thus, defining _NETIOAPI_H_ in net.cc resolves the problem.
> 
> 
> diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
> index eaf6eb8..d6a631b 100644
> --- a/winsup/cygwin/net.cc
> +++ b/winsup/cygwin/net.cc
> @@ -19,6 +19,7 @@ details. */
>     TODO:  Convert if_nametoindex to cygwin_if_nametoindex and call
>  	  system functions on Vista and later. */
>  #define _INC_NETIOAPI
> +#define _NETIOAPI_H_
>  #include "winsup.h"
>  #ifdef __x86_64__
>  /* 2014-04-24: Current Mingw headers define sockaddr_in6 using u_long (8 byte)

I applied this patch.


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Henry S. Thompson]

Corinna Vinschen writes:

> ...

Welcome back!  Hope you had a good holiday.  We staggered along
without you, barely :-).

ht
-- 
       Henry S. Thompson, School of Informatics, University of Edinburgh
      10 Crichton Street, Edinburgh EH8 9AB, SCOTLAND -- (44) 131 650-4440
                Fax: (44) 131 650-4587, e-mail: ht@inf.ed.ac.uk
                       URL: http://www.ltg.ed.ac.uk/~ht/
 [mail from me _always_ has a .sig like this -- mail without it is forged spam]

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

Re: cannot build cygwin-2.0.2 because of net.cc (or because of some header.h)

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

On May 27 12:15, Henry S. Thompson wrote:
> Corinna Vinschen writes:
> 
> > ...
> 
> Welcome back!  Hope you had a good holiday.

Yes, thank you!

> We staggered along
> without you, barely :-).

Ok, let me help staggering ;)


Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]