dix: unexport eventconvert.h functions

This header isn't installed, so no external modules could use the
functions declared there. Thus we can unexport it all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1358>

Xi/exevents.c

@@ -89,6 +89,9 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/geproto.h>
+
+#include "dix/eventconvert.h"
+
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"
@@ -102,7 +105,6 @@ SOFTWARE.
 #include "listdev.h"            /* for CopySwapXXXClass */
 #include "xace.h"
 #include "xiquerydevice.h"      /* For List*Info */
-#include "eventconvert.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "mi.h"

Xi/xiquerypointer.c

@@ -35,6 +35,9 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
@@ -42,7 +45,6 @@
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
-#include "eventconvert.h"
 #include "scrnintstr.h"
 #include "xkbsrv.h"
 

dix/enterleave.c

@@ -32,12 +32,14 @@
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "exglobals.h"
 #include "enterleave.h"
-#include "eventconvert.h"
 #include "xkbsrv.h"
 #include "inpututils.h"
 

dix/eventconvert.c

@@ -39,13 +39,14 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 
+#include "dix/eventconvert.h"
+
 #include "dix.h"
 #include "inputstr.h"
 #include "misc.h"
 #include "eventstr.h"
 #include "exevents.h"
 #include "exglobals.h"
-#include "eventconvert.h"
 #include "inpututils.h"
 #include "xiquerydevice.h"
 #include "xkbsrv.h"

dix/eventconvert.h

@@ -22,21 +22,24 @@
  *
  */
 
-#ifndef _EVENTCONVERT_H_
+#ifndef _XSERVER_EVENTCONVERT_H_
+#define _XSERVER_EVENTCONVERT_H_
+
 #include <X11/X.h>
 #include <X11/extensions/XIproto.h>
+
 #include "input.h"
 #include "events.h"
 #include "eventstr.h"
 
-_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);
+int EventToCore(InternalEvent *event, xEvent **core, int *count);
-_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
+int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
-_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
+int EventToXI2(InternalEvent *ev, xEvent **xi);
-_X_INTERNAL int GetCoreType(enum EventType type);
+int GetCoreType(enum EventType type);
-_X_INTERNAL int GetXIType(enum EventType type);
+int GetXIType(enum EventType type);
-_X_INTERNAL int GetXI2Type(enum EventType type);
+int GetXI2Type(enum EventType type);
 
-_X_INTERNAL enum EventType GestureTypeToBegin(enum EventType type);
+enum EventType GestureTypeToBegin(enum EventType type);
-_X_INTERNAL enum EventType GestureTypeToEnd(enum EventType type);
+enum EventType GestureTypeToEnd(enum EventType type);
 
 #endif                          /* _EVENTCONVERT_H_ */

dix/events.c

@@ -106,6 +106,9 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+
+#include "dix/eventconvert.h"
+
 #include "misc.h"
 #include "resource.h"
 #include <X11/Xproto.h>
@@ -145,7 +148,6 @@ Equipment Corporation.
 
 #include "eventstr.h"
 #include "enterleave.h"
-#include "eventconvert.h"
 #include "mi.h"
 
 /* Extension events type numbering starts at EXTENSION_EVENT_BASE.  */

dix/gestures.c

@@ -27,6 +27,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "dixgrabs.h"
@@ -35,7 +37,6 @@
 #include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
-#include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
 

dix/touch.c

@@ -29,6 +29,7 @@
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/eventconvert.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -38,7 +39,6 @@
 #include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
-#include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
 

hw/xfree86/common/xf86DGA.c

@@ -43,6 +43,9 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/eventconvert.h"
+
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86Priv.h"
@@ -60,7 +63,6 @@
 #include "exglobals.h"
 #include "exevents.h"
 #include "eventstr.h"
-#include "eventconvert.h"
 #include "xf86Extensions.h"
 
 #include "mi.h"

record/record.c

@@ -36,6 +36,8 @@ and Jim Haggerty of Metheus.
 #include <dix-config.h>
 #endif
 
+#include "dix/eventconvert.h"
+
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "extinit.h"
@@ -43,7 +45,6 @@ and Jim Haggerty of Metheus.
 #include "set.h"
 #include "swaprep.h"
 #include "inputstr.h"
-#include "eventconvert.h"
 #include "scrnintstr.h"
 
 #include <stdio.h>

test/input.c

@@ -37,8 +37,10 @@
 #include <X11/Xatom.h>
 #include "windowstr.h"
 #include "inputstr.h"
-#include "eventconvert.h"
 #include "exevents.h"
+
+#include "dix/eventconvert.h"
+
 #include "exglobals.h"
 #include "dixgrabs.h"
 #include "eventstr.h"

test/xi2/protocol-eventconvert.c

@@ -29,9 +29,10 @@
 
 #include <stdint.h>
 
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"
 #include "eventstr.h"
-#include "eventconvert.h"
 #include "exevents.h"
 #include "inpututils.h"
 #include <X11/extensions/XI2proto.h>