> From: Jamey Sharp <[email protected]> > Date: Fri, 17 Sep 2010 11:48:32 +0200 > > Delete time-traveling multiple personality disorder from the server.
IIRC, the code in hw/xfree86/modes was directly included in some of the video drivers. I do believe that all of them have their own copies now, but please check this. Even if those drivers have their own copy of this code, you might want to leave the #ifdefs in there, to make it easier to diff the xserver version and the driver version. > Signed-off-by: Jamey Sharp <[email protected]> > Signed-off-by: Josh Triplett <[email protected]> > --- > hw/xfree86/modes/xf86Cursors.c | 8 -------- > 1 files changed, 0 insertions(+), 8 deletions(-) > > 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 > : NULL; > > /* Save ARGB versions of these colors */ > @@ -630,11 +626,7 @@ xf86_reload_cursors (ScreenPtr screen) > > if (cursor) > { > -#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0) > void *src = dixLookupPrivate(&cursor->devPrivates, > CursorScreenKey(screen)); > -#else > - void *src = cursor->devPriv[screen->myNum]; > -#endif > #ifdef ARGB_CURSOR > if (cursor->bits->argb && cursor_info->LoadCursorARGB) > (*cursor_info->LoadCursorARGB) (scrn, cursor); > -- > 1.7.0 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
