[PATCH xserver 2/2] mi: Remove miPointerRec from API

[Keith Packard]

This moves the definition of miPointerRec from mipointrst.h to
mipointer.c so that it is no longer visible in the API, allowing it to
be changed while the API/ABI is frozen.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 mi/mipointer.c  | 12 ++++++++++++
 mi/mipointrst.h | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 7f95cdb..caa7a9f 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -65,6 +65,18 @@ in this Software without prior written authorization from The Open Group.
 #include   "inpututils.h"
 #include   "eventstr.h"
 
+typedef struct {
+    ScreenPtr pScreen;          /* current screen */
+    ScreenPtr pSpriteScreen;    /* screen containing current sprite */
+    CursorPtr pCursor;          /* current cursor */
+    CursorPtr pSpriteCursor;    /* cursor on screen */
+    BoxRec limits;              /* current constraints */
+    Bool confined;              /* pointer can't change screens */
+    int x, y;                   /* hot spot location */
+    int devx, devy;             /* sprite position */
+    Bool generateEvent;         /* generate an event during warping? */
+} miPointerRec, *miPointerPtr;
+
 DevPrivateKeyRec miPointerScreenKeyRec;
 
 #define GetScreenPrivate(s) ((miPointerScreenPtr) \
diff --git a/mi/mipointrst.h b/mi/mipointrst.h
index 104e45c..4319b12 100644
--- a/mi/mipointrst.h
+++ b/mi/mipointrst.h
@@ -35,18 +35,6 @@ in this Software without prior written authorization from The Open Group.
 #include "scrnintstr.h"
 
 typedef struct {
-    ScreenPtr pScreen;          /* current screen */
-    ScreenPtr pSpriteScreen;    /* screen containing current sprite */
-    CursorPtr pCursor;          /* current cursor */
-    CursorPtr pSpriteCursor;    /* cursor on screen */
-    BoxRec limits;              /* current constraints */
-    Bool confined;              /* pointer can't change screens */
-    int x, y;                   /* hot spot location */
-    int devx, devy;             /* sprite position */
-    Bool generateEvent;         /* generate an event during warping? */
-} miPointerRec, *miPointerPtr;
-
-typedef struct {
     miPointerSpriteFuncPtr spriteFuncs; /* sprite-specific methods */
     miPointerScreenFuncPtr screenFuncs; /* screen-specific methods */
     CloseScreenProcPtr CloseScreen;
-- 
2.8.0.rc3