No DDX overrode this, and we never actually called through that slot anyway.
Signed-off-by: Adam Jackson <[email protected]> --- hw/dmx/dmxcursor.c | 1 - hw/kdrive/ephyr/ephyr.c | 1 - hw/xfree86/common/xf86Cursor.c | 2 -- hw/xquartz/xpr/xprCursor.c | 1 - mi/mipointer.c | 5 ----- mi/mipointer.h | 3 --- 6 files changed, 13 deletions(-) diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index edb849a..99afd8c 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -197,7 +197,6 @@ miPointerScreenFuncRec dmxPointerCursorFuncs = { dmxCursorOffScreen, dmxCrossScreen, dmxWarpCursor, - NULL, }; /** Create a list of screens that we'll manipulate. */ diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 7022326..0485e4f 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -824,7 +824,6 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs = { ephyrCursorOffScreen, ephyrCrossScreen, ephyrWarpCursor, - NULL, }; #ifdef XF86DRI diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 973bdd3..7d0776e 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -72,8 +72,6 @@ static miPointerScreenFuncRec xf86PointerScreenFuncs = { xf86CursorOffScreen, xf86CrossScreen, xf86WarpCursor, - /* let miPointerInitialize take care of these */ - NULL, }; static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS]; diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index 6e617c7..4168f7c 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -305,7 +305,6 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = { QuartzCursorOffScreen, QuartzCrossScreen, QuartzWarpCursor, - NULL, }; /* diff --git a/mi/mipointer.c b/mi/mipointer.c index e33c344..15d5406 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -118,11 +118,6 @@ miPointerInitialize(ScreenPtr pScreen, return FALSE; pScreenPriv->spriteFuncs = spriteFuncs; pScreenPriv->screenFuncs = screenFuncs; - /* - * check for uninitialized methods - */ - if (!screenFuncs->EnqueueEvent) - screenFuncs->EnqueueEvent = mieqEnqueue; pScreenPriv->waitForUpdate = waitForUpdate; pScreenPriv->showTransparent = FALSE; pScreenPriv->CloseScreen = pScreen->CloseScreen; diff --git a/mi/mipointer.h b/mi/mipointer.h index 2c2506f..f49c253 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -71,9 +71,6 @@ typedef struct _miPointerScreenFuncRec { int /* x */ , int /* y */ ); - void (*EnqueueEvent) (DeviceIntPtr /* pDev */ , - InternalEvent * /* event */ - ); } miPointerScreenFuncRec, *miPointerScreenFuncPtr; extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ , -- 1.7.12.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
