diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-03 16:05:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-10-03 17:51:19 -0400 |
| commit | 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f (patch) | |
| tree | 014f594e45f09999a782ffe4b6f74c2f8a8699c0 /mi/micursor.c | |
| parent | e6b1c1fada19268af559d89375989973729fdb19 (diff) | |
Remove the Must_have_memory hack.
Also remove an astonishing amount of misunderstanding of how casts work.
Diffstat (limited to 'mi/micursor.c')
| -rw-r--r-- | mi/micursor.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mi/micursor.c b/mi/micursor.c index ec20946a3..8b1649039 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -54,8 +54,6 @@ SOFTWARE. #include "mi.h" #include "inputstr.h" -extern Bool Must_have_memory; - _X_EXPORT void miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, CursorPtr pCurs, Bool displayed) @@ -64,11 +62,8 @@ miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, * This is guaranteed to correct any color-dependent state which may have * been bound up in private state created by RealizeCursor */ - (* pScr->UnrealizeCursor)( pDev, pScr, pCurs); - Must_have_memory = TRUE; /* XXX */ - (* pScr->RealizeCursor)( pDev, pScr, pCurs); - Must_have_memory = FALSE; /* XXX */ - if ( displayed) - (* pScr->DisplayCursor)( pDev, pScr, pCurs); - + pScr->UnrealizeCursor(pDev, pScr, pCurs); + pScr->RealizeCursor(pDev, pScr, pCurs); + if (displayed) + pScr->DisplayCursor(pDev, pScr, pCurs); } |