svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

1 files changed, 11 insertions, 26 deletions

diff --git a/xorg-server/mi/mipointer.h b/xorg-server/mi/mipointer.h
index d1eac987f..22575ea21 100644
--- a/xorg-server/mi/mipointer.h
+++ b/xorg-server/mi/mipointer.h
@@ -82,7 +82,7 @@ typedef struct _miPointerScreenFuncRec {
                     );
     void	(*EnqueueEvent)(
                     DeviceIntPtr /* pDev */,
-                    xEventPtr /* event */
+                    InternalEvent* /* event */
                     );
     void	(*NewEventScreen)(
 		    DeviceIntPtr /* pDev */,
@@ -91,69 +91,54 @@ typedef struct _miPointerScreenFuncRec {
                     );
 } miPointerScreenFuncRec, *miPointerScreenFuncPtr;
 
-extern Bool miDCInitialize(
+extern _X_EXPORT Bool miDCInitialize(
     ScreenPtr /*pScreen*/,
     miPointerScreenFuncPtr /*screenFuncs*/
 );
 
-extern Bool miPointerInitialize(
+extern _X_EXPORT Bool miPointerInitialize(
     ScreenPtr /*pScreen*/,
     miPointerSpriteFuncPtr /*spriteFuncs*/,
     miPointerScreenFuncPtr /*screenFuncs*/,
     Bool /*waitForUpdate*/
 );
 
-extern void miPointerWarpCursor(
+extern _X_EXPORT void miPointerWarpCursor(
     DeviceIntPtr /*pDev*/,
     ScreenPtr /*pScreen*/,
     int /*x*/,
     int /*y*/
-) _X_DEPRECATED;
-
-extern int miPointerGetMotionEvents(
-    DeviceIntPtr /*pPtr*/,
-    xTimecoord * /*coords*/,
-    unsigned long /*start*/,
-    unsigned long /*stop*/,
-    ScreenPtr /*pScreen*/
 );
 
-/* Deprecated in favour of miPointerSetPosition. */
-extern void miPointerAbsoluteCursor(
-    int /*x*/,
-    int /*y*/,
-    unsigned long /*time*/
-) _X_DEPRECATED;
-
 /* Deprecated in favour of miPointerGetScreen. */
-extern ScreenPtr miPointerCurrentScreen(
+extern _X_EXPORT ScreenPtr miPointerCurrentScreen(
     void
 ) _X_DEPRECATED;
 
-extern ScreenPtr miPointerGetScreen(
+extern _X_EXPORT ScreenPtr miPointerGetScreen(
     DeviceIntPtr pDev);
-extern void miPointerSetScreen(
+extern _X_EXPORT void miPointerSetScreen(
     DeviceIntPtr pDev,
     int screen_num,
     int x,
     int y);
 
 /* Returns the current cursor position. */
-extern void miPointerGetPosition(
+extern _X_EXPORT void miPointerGetPosition(
     DeviceIntPtr pDev,
     int *x,
     int *y);
 
 /* Moves the cursor to the specified position.  May clip the co-ordinates:
  * x and y are modified in-place. */
-extern void miPointerSetPosition(
+extern _X_EXPORT void miPointerSetPosition(
     DeviceIntPtr pDev,
     int *x,
     int *y);
 
-extern void miPointerUpdateSprite(
+extern _X_EXPORT void miPointerUpdateSprite(
     DeviceIntPtr pDev);
 
-extern DevPrivateKey miPointerScreenKey;
+extern _X_EXPORT DevPrivateKey miPointerScreenKey;
 
 #endif /* MIPOINTER_H */