Re: [1/3] include: Add stuff related to WSAPoll() (try 2)

[Alexandre Julliard]

Bruno Jesus  writes:
> try 2:
> I found the solution to typedef the struct pollfd just like it's done
> with fd_set.

Unfortunately that doesn't work on mingw:

In file included from ../../../wine/include/winsock2.h:50:0,
                 from ../../../wine/include/ws2tcpip.h:22,
                 from ../../../wine/dlls/jsproxy/main.c:34:
../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’
../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’
In file included from ../../../wine/dlls/jsproxy/main.c:20:0:
../../../wine/include/wine/port.h:284:8: note: originally defined here

[1/3] include: Add stuff related to WSAPoll() (try 2)

[Bruno Jesus]

On Tue, May 26, 2015 at 10:59 AM, Alexandre Julliard
 wrote:
> Bruno Jesus  writes:
> > try 2:
> > I found the solution to typedef the struct pollfd just like it's done
> > with fd_set.
>
> Unfortunately that doesn't work on mingw:
>
> In file included from ../../../wine/include/winsock2.h:50:0,
>                  from ../../../wine/include/ws2tcpip.h:22,
>                  from ../../../wine/dlls/jsproxy/main.c:34:
> ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’
> ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’
> In file included from ../../../wine/dlls/jsproxy/main.c:20:0:
> ../../../wine/include/wine/port.h:284:8: note: originally defined here

Thanks for the feedback, any hints? Can anybody explain why it works
for fd_set and not pollfd?

Best wishes,
Bruno

[1/3] include: Add stuff related to WSAPoll() (try 2)

[Alexandre Julliard]

Bruno Jesus  writes:
> On Tue, May 26, 2015 at 10:59 AM, Alexandre Julliard
>  wrote:
> > Unfortunately that doesn't work on mingw:
> >
> > In file included from ../../../wine/include/winsock2.h:50:0,
> >                  from ../../../wine/include/ws2tcpip.h:22,
> >                  from ../../../wine/dlls/jsproxy/main.c:34:
> > ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’
> > ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’
> > In file included from ../../../wine/dlls/jsproxy/main.c:20:0:
> > ../../../wine/include/wine/port.h:284:8: note: originally defined here
>
> Thanks for the feedback, any hints? Can anybody explain why it works
> for fd_set and not pollfd?

Because pollfd is defined in wine/port.h, for other parts of Wine that
need it.

[1/3] include: Add stuff related to WSAPoll() (try 2)

[Bruno Jesus]

On Tue, May 26, 2015 at 8:23 PM, Alexandre Julliard  wrote:
> Bruno Jesus  writes:
> > On Tue, May 26, 2015 at 10:59 AM, Alexandre Julliard
> >  wrote:
> > > Unfortunately that doesn't work on mingw:
> > >
> > > In file included from ../../../wine/include/winsock2.h:50:0,
> > >                  from ../../../wine/include/ws2tcpip.h:22,
> > >                  from ../../../wine/dlls/jsproxy/main.c:34:
> > > ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’
> > > ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’
> > > In file included from ../../../wine/dlls/jsproxy/main.c:20:0:
> > > ../../../wine/include/wine/port.h:284:8: note: originally defined here
> >
> > Thanks for the feedback, any hints? Can anybody explain why it works
> > for fd_set and not pollfd?
>
> Because pollfd is defined in wine/port.h, for other parts of Wine that
> need it.

I have depleted my knowledge on #ifdef and configure scripts and I
can't find a way to solve this problem. Can anyone help me?

Best regards,
Bruno

[1/3] include: Add stuff related to WSAPoll() (try 2)

[Matteo Bruni]

2015-06-12 0:30 GMT+02:00 Bruno Jesus :
> On Tue, May 26, 2015 at 8:23 PM, Alexandre Julliard  wrote:
> > Bruno Jesus  writes:
> > > On Tue, May 26, 2015 at 10:59 AM, Alexandre Julliard
> > >  wrote:
> > > > Unfortunately that doesn't work on mingw:
> > > >
> > > > In file included from ../../../wine/include/winsock2.h:50:0,
> > > >                  from ../../../wine/include/ws2tcpip.h:22,
> > > >                  from ../../../wine/dlls/jsproxy/main.c:34:
> > > > ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’
> > > > ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’
> > > > In file included from ../../../wine/dlls/jsproxy/main.c:20:0:
> > > > ../../../wine/include/wine/port.h:284:8: note: originally defined here
> > >
> > > Thanks for the feedback, any hints? Can anybody explain why it works
> > > for fd_set and not pollfd?
> >
> > Because pollfd is defined in wine/port.h, for other parts of Wine that
> > need it.
>
> I have depleted my knowledge on #ifdef and configure scripts and I
> can't find a way to solve this problem. Can anyone help me?
>
> Best regards,
> Bruno

I haven't tested it but maybe choosing the struct name depending on
__WINE_WINE_PORT_H being defined or not works? It's not very nice,
there might be better solutions for sure...