diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-17 15:00:54 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-17 15:00:54 -0400 |
| commit | c3f7b862550fa8f46633162f83db8c27e46fc672 (patch) | |
| tree | a8427c93c96af2bbf2133b07f2510ff31560e54d /mi | |
| parent | af4dde0ac19ecec1d0ad988eb25b15401e7c6b36 (diff) | |
| parent | feac0759522cbdc3e61ccfa373df735903c5cb27 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
os/access.c
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/micoord.h | 3 | ||||
| -rw-r--r-- | mi/mipointer.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mi/micoord.h b/mi/micoord.h index b3d725b73..16a244b96 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -46,8 +46,7 @@ #if defined(mips) || defined(sgi) || \ defined(sparc) || defined(__sparc64__) || \ defined(__alpha) || defined(__alpha__) || \ - defined(__i386__) || defined(i386) || \ - defined(__ia64__) || defined(ia64) || \ + defined(__i386__) || defined(__ia64__) || \ defined(__s390x__) || defined(__s390__) || \ defined(__amd64__) || defined(amd64) || defined(__amd64) #define GetHighWord(x) (((int) (x)) >> 16) diff --git a/mi/mipointer.c b/mi/mipointer.c index 4d1db4fca..2c3c68913 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -255,6 +255,7 @@ miPointerWarpCursor (pScreen, x, y) miPointer.y = y; miPointer.pScreen = pScreen; } + UpdateSpriteForScreen (pScreen) ; } /* |