wine/port.h #include fixes

Patrik Stridvall ps at leissner.se
Mon Oct 15 07:32:35 CDT 2001


> François Gouget wrote:
> > 
> >    This is a followup on the previous config.h patch, this 
> time tackling
> > the wine/port.h case.
> 
>    Hmmm, I see it has been applied to CVS already. But I'm 
> not too happy
> with it anymore :-/
>
>    I found a problem with 'dlls/winsock/async.c' and
> 'dlls/winsock/socket.c' and the DELETE macro.
>  * DELETE is defined in winnt.h
>  * DELETE is also defined by a socket-related Solaris header
> (arpa/nameser_compat.h, included indirectly)
>  * so winnt.h undefs DELETE and then defines our value

Yes. That is a problem. 

ERR IIRC is another problem on Solaris. That is why 
#include "debugtools.h" is always done after all other includes.

>  * 'wine/port.h' includes 'winnt.h'. So if we include it 
> first and then
> include the Solaris header we get a redefinition error.

No it doesn't. At least not any longer.



More information about the wine-devel mailing list