From 7368b45408690620b8a9c051670888b684e44637 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 27 Feb 2018 02:47:11 +0100 Subject: Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/mi/mipointer.c | 2 +- nx-X11/programs/Xserver/mi/misprite.c | 2 +- 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 -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); -- cgit v1.2.3