Patches for FreeBSD 5.x compilation

Steve Kargl sgk at troutmask.apl.washington.edu
Sun Nov 18 16:18:13 CST 2001


On Sun, Nov 18, 2001 at 01:40:17PM -0800, Francois Gouget wrote:
> On Sun, 18 Nov 2001, Steve Kargl wrote:
> 
> > Index: wine/server/context_i386.c
> > ===================================================================
> > RCS file: /home/wine/wine/server/context_i386.c,v
> > retrieving revision 1.18
> > diff -u -r1.18 context_i386.c
> > --- wine/server/context_i386.c	2001/07/11 17:30:59	1.18
> > +++ wine/server/context_i386.c	2001/11/18 18:42:55
> > @@ -20,9 +20,6 @@
> >  #ifdef HAVE_SYS_PARAM_H
> >  # include <sys/param.h>
> >  #endif
> > -#ifdef HAVE_SYS_USER_H
> > -# include <sys/user.h>
> > -#endif
> 
>    What is the problem with 'sys/user.h' ?
> 

<sys/user.h> brings in <sys/proc.h>.  In FreeBSD 5.x,
<sys/proc.h> has a struct thread that conflicts with
the definition of struct thread in server/thread.h.

I tried renaming struct thread in in server/thread.h
to struct wine_thread, but I couldn't figure out how
to change server/request.h.

-- 
Steve




More information about the wine-devel mailing list