os: unexport ResetCurrentRequest()

Not used by any external modules, so no need to keep it in public API.

Since it's used by DRI, still needs the _X_EXPORT flag, as long as DRI
is a dynamically loaded module.

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

Xext/xtest.c

@@ -40,6 +40,7 @@
 #include "dix/exevents_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
+#include "os/client_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"

glx/glxext.c

@@ -31,6 +31,9 @@
 #include <dix-config.h>
 
 #include <string.h>
+
+#include "os/client_priv.h"
+
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>

hw/xfree86/dri2/dri2.c

@@ -35,6 +35,9 @@
 #endif
 
 #include <errno.h>
+
+#include "os/client_priv.h"
+
 #ifdef WITH_LIBDRM
 #include <xf86drm.h>
 #endif

hw/xwayland/xwayland-drm-lease.c

@@ -26,6 +26,8 @@
 
 #include <xwayland-config.h>
 
+#include "os/client_priv.h"
+
 #ifdef WITH_LIBDRM
 #include <xf86drm.h>
 #include <xf86drmMode.h>

include/os.h

@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
 
 extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
 
-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client */ );
-
 extern _X_EXPORT void FlushAllOutput(void);
 
 extern _X_EXPORT void FlushIfCriticalOutputPending(void);

os/client_priv.h

@@ -8,6 +8,7 @@
 
 #include <sys/types.h>
 #include <X11/Xdefs.h>
+#include <X11/Xfuncproto.h>
 
 /* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
  * instead of accessing the fields directly. */
@@ -46,4 +47,7 @@ int ReadRequestFromClient(struct _Client *client);
 int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
 Bool InsertFakeRequest(struct _Client *client, char *data, int count);
 
+/* exported only for DRI module, but should not be used by external drivers */
+_X_EXPORT void ResetCurrentRequest(struct _Client *client);
+
 #endif /* _XSERVER_DIX_CLIENT_PRIV_H */