Patches for FreeBSD 5.x compilation
fgouget at free.fr
Sun Nov 18 21:56:02 CST 2001
On Sun, 18 Nov 2001, Steve Kargl wrote:
> 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.
Renaming struct thread it the right thing to do though. Why
doesn't changing thread to wine_thread in request.h work?
Btw, aren't we likely to get similar problems with 'struct process'
and 'struct mutex'? They look like prime candidates for a name clash. It
may be a good idea to rename them too.
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
I haven't lost my mind, it's backed up on tape around here somewhere...
More information about the wine-devel