Hi James, thank you for the patch. will try it asap (don't have access to my wine box for the moment). Cheers, Sylvain. --- James Juran <jamesjuran@alumni.psu.edu> a écrit : > [Gerard BCC'd to protect his real email address from > Usenet spam] > > James Juran wrote: > > gerard patel wrote: > > > > > > On Wed, 28 Nov 2001 18:19:05 +0100 (CET), > > > =?iso-8859-1?q?Sylvain=20Petreolle?= > <spetreolle@yahoo.fr> wrote: > [...] > > > >../../include/winsock.h:886: conflicting types > for > > > >`gethostname' > > > >/usr/include/unistd.h:734: previous declaration > of `gethostname' > > > > > > All I can say is that the thing compiles for me > - useless as it > > > is- under gcc 2.96 (not the RedHat special > edition :-)) with > > > cvs as of this morning (30 nov 2001) > > > > I think this may be a glibc issue, rather than a > compiler issue. I get > > the same error as Sylvain. I'm using a Red Hat > 7.2 machine. The exact > > same error occurs with Red Hat's gcc-2.96-98 and > gcc3-3.0.1-3. > > Here's a patch to work around this issue. Since a > help reader has no > business using Winsock at all, we should only > include the header files > we really need, rather than just including > windows.h. This keeps > winsock.h from being included at all, which avoids > this conflict > altogether. > > I'll send this to wine-patches when WineHQ's disk is > no longer full and > it accepts messages again. > > James Juran <jamesjuran@alumni.psu.edu> > Only include the necessary files to avoid conflicts > in gethostname > prototypes between winsock.h and unistd.h > > Index: wine/programs/winhelp/macro.h > =================================================================== > RCS file: /home/wine/wine/programs/winhelp/macro.h,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 macro.h > --- wine/programs/winhelp/macro.h 1998/09/24 > 03:43:39 1.1.1.1 > +++ wine/programs/winhelp/macro.h 2001/12/01 > 21:43:40 > @@ -4,7 +4,12 @@ > * Copyright 1996 Ulrich Schmid > */ > > -#include "windows.h" > +#include "winnt.h" > +#include "windef.h" > +#include "winbase.h" > +#include "winuser.h" > +#include "wingdi.h" > +#include "shellapi.h" > > VOID MACRO_ExecuteMacro(LPCSTR); > > > -- > James Juran > jamesjuran@alumni.psu.edu ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Courrier : http://courrier.yahoo.fr
