diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
| commit | f331b3c351021681044b2594d1ec5b49bd8edb47 (patch) | |
| tree | 3f593072cd3390f173857a4d0484938aed8863c1 /xorg-server/hw/xfree86/modes/xf86Cursors.c | |
| parent | 4e512860d6f0a7644ae3872d91edafa9040f608a (diff) | |
| parent | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (diff) | |
| download | vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.gz vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.bz2 vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index 090f29c2f..6886ad7b2 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/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);
|