[PATCH 1/3] Xserver need not be compatible with old versions of xserver.

Mark Kettenis mark.kettenis at xs4all.nl
Fri Sep 17 08:31:50 PDT 2010


> Date: Fri, 17 Sep 2010 17:23:23 +0200
> From: Peter Hutterer <peter.hutterer at who-t.net>
> 
> On Fri, Sep 17, 2010 at 12:23:53PM +0200, jamey at minilop.net wrote:
> > On Fri, Sep 17, 2010 at 12:19 PM, Mark Kettenis <mark.kettenis at xs4all.nl> wrote:
> > >> From: Jamey Sharp <jamey at minilop.net>
> > >> Date: Fri, 17 Sep 2010 11:48:32 +0200
> > >>
> > >> diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
> > >> index 6b2ae97..ab07b60 100644
> > >> --- a/hw/xfree86/modes/xf86Cursors.c
> > >> +++ b/hw/xfree86/modes/xf86Cursors.c
> > >> @@ -227,11 +227,7 @@ xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
> > >>      CursorPtr                cursor = xf86_config->cursor;
> > >>      int                      c;
> > >>      CARD8            *bits = cursor ?
> > >> -#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
> > >>          dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))
> > >> -#else
> > >> -        cursor->devPriv[screen->myNum]
> > >> -#endif
> > >
> > > Wait a moment.  You're keeping the code that's used for *older* Xorg
> > > versions in favour of the code used in newer versions?
> > 
> > I know it looks that way, but it isn't true. I don't understand what
> > the ifdef actually means, but the dix function call is definitely the
> > current API.
> 
> from the commit that introduced it:
>     This change uses XORG_VERSION_CURRENT <  7.0 to mean "server newer
>     than 1.2" since XORG_VERSION current went backwards at some point.

Oh, brilliant!

In that case, I'm very much in favour of this diff.


More information about the xorg-devel mailing list