xserver: Branch 'master' - 12 commits

[Peter Hutterer]

On Thu, Feb 25, 2010 at 10:37:15PM +0100, Julien Cristau wrote:
> On Tue, Feb 23, 2010 at 11:47:34 +1000, Peter Hutterer wrote:
> 
> > > diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c
> > > index 74353a9..7421be3 100644
> > > --- a/hw/dmx/examples/xinput.c
> > > +++ b/hw/dmx/examples/xinput.c
> > > @@ -233,7 +233,7 @@ int main(int argc, char **argv)
> > >          int         total = 0;
> > >  
> > >  #define ADD(type)                                     \
> > > -        if (cnt >= MAX_EVENTS) abort();               \
> > > +        if (cnt >= MAX_EVENTS) OsAbort();             \
> > 
> > 
> > This leads to a build error on my box here, looks like there's some changes
> > to the linking order needed as well.
> > 
> I don't think it's a linking order issue.  hw/dmx/examples/xinput.c is a
> client, so it should have kept using abort().

oh, good point thanks. I didn't even look at it before. Patch on xorg-devel.

Cheers,
  Peter