From c2914634c4cf768fb2e8ad52ee03ae76acf2ad20 Mon Sep 17 00:00:00 2001 From: kohnish Date: Tue, 18 Nov 2025 21:39:44 +0100 Subject: [PATCH] Revert "mi: unexport mieqEnqueue()" This reverts commit 9dd280607f51cf1bb0337283c9f9dc0540c35ab0. --- Xi/xibarriers.c | 2 +- dix/getevents.c | 1 + hw/xfree86/common/xf86DGA.c | 2 +- mi/mi.h | 4 ++++ mi/mi_priv.h | 3 --- mi/mipointer.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index bca99b3d3..f6f3b16f4 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -45,7 +45,6 @@ #include "dix/dix_priv.h" #include "dix/input_priv.h" -#include "mi/mi_priv.h" #include "xibarriers.h" #include "scrnintstr.h" @@ -59,6 +58,7 @@ #include "list.h" #include "exglobals.h" #include "eventstr.h" +#include "mi.h" RESTYPE PointerBarrierType; diff --git a/dix/getevents.c b/dix/getevents.c index 4cdd2b711..a81a201b2 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -55,6 +55,7 @@ #include "eventstr.h" #include "eventconvert.h" #include "inpututils.h" +#include "mi.h" #include "windowstr.h" #include "xkbsrv.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 41b58d9e3..1fbc36a66 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -50,7 +50,6 @@ #include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_priv.h" -#include "mi/mi_priv.h" #include "xf86.h" #include "xf86str.h" @@ -68,6 +67,7 @@ #include "exglobals.h" #include "eventstr.h" #include "xf86Extensions.h" +#include "mi.h" #include "misc.h" #include "dixstruct.h" #include "dixevents.h" diff --git a/mi/mi.h b/mi/mi.h index 231f0d1a6..5e8339ef8 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -114,6 +114,10 @@ miDoCopy(DrawablePtr pSrcDrawable, typedef struct _DeviceRec *DevicePtr; #endif +extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ , + InternalEvent * /*e */ + ); + extern _X_EXPORT void mieqSwitchScreen(DeviceIntPtr /* pDev */ , ScreenPtr /*pScreen */ , Bool /*set_dequeue_screen */ diff --git a/mi/mi_priv.h b/mi/mi_priv.h index 906238a81..1324dcac1 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -8,7 +8,6 @@ #include #include -#include "include/events.h" #include "include/gc.h" #include "include/pixmap.h" #include "include/screenint.h" @@ -19,9 +18,7 @@ void miScreenClose(ScreenPtr pScreen); void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs); void miStepDash(int dist, int * pDashIndex, unsigned char * pDash, int numInDashList, int *pDashOffset); - Bool mieqInit(void); void mieqFini(void); -void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e); #endif /* _XSERVER_MI_PRIV_H */ diff --git a/mi/mipointer.c b/mi/mipointer.c index 5196b2688..4fd0a0c11 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -54,12 +54,12 @@ in this Software without prior written authorization from The Open Group. #include "dix/dix_priv.h" #include "dix/input_priv.h" -#include "mi/mi_priv.h" #include "mi/mipointer_priv.h" #include "misc.h" #include "windowstr.h" #include "pixmapstr.h" +#include "mi.h" #include "scrnintstr.h" #include "mipointrst.h" #include "cursorstr.h"