Revert "mi: unexport mieqInit()"

This reverts commit 5ac361cce9.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2102>

hw/kdrive/src/kinput.c

@@ -53,6 +53,12 @@
 #include "inpututils.h"
 #include "optionstr.h"
 
+#include "os/cmdline.h"
+
+#if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
+#include <hotplug.h>
+#endif
+
 #define AtomFromName(x) MakeAtom(x, strlen(x), 1)
 
 struct KdConfigDevice {

hw/vfb/InitInput.c

@@ -29,16 +29,14 @@ from The Open Group.
 #include <dix-config.h>
 
 #include <X11/X.h>
+#include "mi.h"
 #include <X11/Xproto.h>
-#include <X11/Xos.h>
-#include <X11/keysym.h>
-
-#include "mi/mi_priv.h"
-
 #include "scrnintstr.h"
 #include "inputstr.h"
+#include <X11/Xos.h>
 #include "mipointer.h"
 #include "xkbsrv.h"
+#include <X11/keysym.h>
 #include "xserver-properties.h"
 #include "exevents.h"
 #include "extinit.h"

hw/xfree86/common/xf86Init.c

@@ -55,13 +55,13 @@
 #include "config/hotplug_priv.h"
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
-#include "mi/mi_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 
 #include "servermd.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
+#include "mi.h"
 #include "systemd-logind.h"
 
 #include "loaderProcs.h"

hw/xnest/Init.c

@@ -21,7 +21,6 @@ is" without express or implied warranty.
 #include <X11/fonts/libxfont2.h>
 
 #include "dix/screenint_priv.h"
-#include "mi/mi_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"
@@ -30,6 +29,7 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
+#include "mi.h"
 #include "dixfontstr.h"
 #include "extinit_priv.h"
 #include "Xnest.h"

hw/xquartz/darwinEvents.c

@@ -45,16 +45,14 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
-
-#include "mi/mi_priv.h"
 #include "os/client_priv.h"
-
 #include "misc.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
 #include "inpututils.h"
 #include "eventstr.h"
+#include "mi.h"
 #include "scrnintstr.h"
 #include "mipointer.h"
 #include "os.h"

hw/xwayland/xwayland-input.c

@@ -32,13 +32,13 @@
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include <inputstr.h>
 #include <xkbsrv.h>
 #include <xserver-properties.h>
 #include <inpututils.h>
+#include <mi.h>
 #include <mipointer.h>
 #include <mipointrst.h>
 #include <misc.h>

hw/xwin/InitInput.c

@@ -29,9 +29,6 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
-
-#include "mi/mi_priv.h"
-
 #include "win.h"
 #include "dixstruct_priv.h"
 #include "inputstr.h"

mi/mi.h

@@ -114,6 +114,9 @@ miDoCopy(DrawablePtr pSrcDrawable,
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
+extern _X_EXPORT Bool mieqInit(void
+    );
+
 extern _X_EXPORT void mieqFini(void);
 
 extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,

mi/mi_priv.h

@@ -5,7 +5,6 @@
 #ifndef _XSERVER_MI_PRIV_H
 #define _XSERVER_MI_PRIV_H
 
-#include <X11/Xdefs.h>
 #include <X11/Xprotostr.h>
 
 #include "include/gc.h"
@@ -18,6 +17,5 @@ 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);
 
 #endif /* _XSERVER_MI_PRIV_H */

mi/mieq.c

@@ -41,7 +41,6 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/extensions/XIproto.h>
 #include   <X11/extensions/geproto.h>
 
-#include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"
 
@@ -50,6 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "pixmapstr.h"
 #include   "inputstr.h"
 #include   "inpututils.h"
+#include   "mi.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
 #include   "extinit.h"

test/input.c

@@ -37,7 +37,6 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "resource.h"
@@ -46,6 +45,7 @@
 #include "exglobals.h"
 #include "eventstr.h"
 #include "inpututils.h"
+#include "mi.h"
 #include "assert.h"
 
 #include "tests-common.h"