diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
| commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
| tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /xorg-server/mi/mipointer.h | |
| parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
| parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
| download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/mi/mipointer.h')
| -rw-r--r-- | xorg-server/mi/mipointer.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/xorg-server/mi/mipointer.h b/xorg-server/mi/mipointer.h index f89dff31e..bdeed1242 100644 --- a/xorg-server/mi/mipointer.h +++ b/xorg-server/mi/mipointer.h @@ -71,13 +71,6 @@ typedef struct _miPointerScreenFuncRec { int /* x */ , int /* y */ ); - void (*EnqueueEvent) (DeviceIntPtr /* pDev */ , - InternalEvent * /* event */ - ); - void (*NewEventScreen) (DeviceIntPtr /* pDev */ , - ScreenPtr /* pScr */ , - Bool /* set_dequeue_screen */ - ); } miPointerScreenFuncRec, *miPointerScreenFuncPtr; extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ , @@ -98,11 +91,6 @@ extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ , int /*y */ ); -/* Deprecated in favour of miPointerGetScreen. */ -extern _X_EXPORT ScreenPtr -miPointerCurrentScreen(void -) _X_DEPRECATED; - extern _X_EXPORT ScreenPtr miPointerGetScreen(DeviceIntPtr pDev); extern _X_EXPORT void |