diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /xorg-server/hw/xfree86/modes/xf86Cursors.c | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index 066744744..23c48eb9e 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c @@ -252,7 +252,7 @@ xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg) CursorPtr cursor = xf86_config->cursor; int c; CARD8 *bits = cursor ? - dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen)) + dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen) : NULL; /* Save ARGB versions of these colors */ @@ -650,7 +650,7 @@ xf86_reload_cursors (ScreenPtr screen) if (cursor) { - void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen)); + void *src = dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen); #ifdef ARGB_CURSOR if (cursor->bits->argb && cursor_info->LoadCursorARGB) (*cursor_info->LoadCursorARGB) (scrn, cursor); |