From 9dd280607f51cf1bb0337283c9f9dc0540c35ab0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 22 Apr 2024 12:48:44 +0200 Subject: [PATCH] mi: unexport mieqEnqueue() Not used by any (known) drivers, so no need to keep it exported. Part-of: --- Xi/xibarriers.c | 2 +- dix/getevents.c | 3 ++- hw/xfree86/common/xf86DGA.c | 2 +- mi/mi.h | 4 ---- mi/mi_priv.h | 3 +++ mi/mipointer.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 067f71be7..bd664ae8a 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -46,6 +46,7 @@ #include "dix/cursor_priv.h" #include "dix/dix_priv.h" #include "dix/input_priv.h" +#include "mi/mi_priv.h" #include "xibarriers.h" #include "scrnintstr.h" @@ -59,7 +60,6 @@ #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 66f3e19aa..76b16fa04 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -42,6 +42,8 @@ #include "dix/input_priv.h" +#include "mi/mi_priv.h" + #include "misc.h" #include "resource.h" #include "inputstr.h" @@ -54,7 +56,6 @@ #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 3ce1f1259..72bf4f115 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -50,6 +50,7 @@ #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" @@ -67,7 +68,6 @@ #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 5e8339ef8..231f0d1a6 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -114,10 +114,6 @@ 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 1324dcac1..906238a81 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -8,6 +8,7 @@ #include #include +#include "include/events.h" #include "include/gc.h" #include "include/pixmap.h" #include "include/screenint.h" @@ -18,7 +19,9 @@ 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 0f7d61f69..a74f50e85 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -55,12 +55,12 @@ in this Software without prior written authorization from The Open Group. #include "dix/cursor_priv.h" #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"