aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-02-27 02:47:11 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 02:47:11 +0100
commit7368b45408690620b8a9c051670888b684e44637 (patch)
tree6cf8e93ad29709867617cb03b89bfbc6356126c5
parent6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (diff)
downloadnx-libs-7368b45408690620b8a9c051670888b684e44637.tar.gz
nx-libs-7368b45408690620b8a9c051670888b684e44637.tar.bz2
nx-libs-7368b45408690620b8a9c051670888b684e44637.zip
Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes only
-rw-r--r--nx-X11/programs/Xserver/mi/mipointer.c2
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c
index dc5a4985d..5a874a4a0 100644
--- a/nx-X11/programs/Xserver/mi/mipointer.c
+++ b/nx-X11/programs/Xserver/mi/mipointer.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
# include "dixstruct.h"
# include <nx-X11/extensions/XI.h>
-int miPointerScreenIndex;
+int miPointerScreenIndex;
static unsigned long miPointerGeneration = 0;
#define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c
index 67ac717ed..62acb5d29 100644
--- a/nx-X11/programs/Xserver/mi/misprite.c
+++ b/nx-X11/programs/Xserver/mi/misprite.c
@@ -102,7 +102,7 @@ static void miSpriteComputeSaved(ScreenPtr pScreen);
((pScreen)->field = miSprite##field)
/*
- * void *-sprite method table
+ * pointer-sprite method table
*/
static Bool miSpriteRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);