dix: unexport some lookup functions

These aren't used by any drivers, so no need to export them.

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

dix/devices.c

@@ -49,13 +49,14 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
 #include "dix/ptrveloc_priv.h"
 
 #include "misc.h"
 #include "resource.h"
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

dix/dix_priv.h

@@ -17,6 +17,7 @@
 #include <X11/Xfuncproto.h>
 
 #include "include/dix.h"
+#include "include/gc.h"
 #include "include/window.h"
 
 /* server setting: maximum size for big requests */
@@ -53,4 +54,28 @@ Bool dixLookupBuiltinColor(int screen,
 
 void DeleteWindowFromAnySaveSet(WindowPtr pWin);
 
+#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)                   \
+    do {                                                                \
+        int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode); \
+        if (tmprc != Success)                                           \
+            return tmprc;                                               \
+        tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);   \
+        if (tmprc != Success)                                           \
+            return tmprc;                                               \
+        if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen)) \
+            return BadMatch;                                            \
+        if (pGC->serialNumber != pDraw->serialNumber)                   \
+            ValidateGC(pDraw, pGC);                                     \
+    } while (0)
+
+int dixLookupGC(GCPtr *result,
+                XID id,
+                ClientPtr client,
+                Mask access_mode);
+
+int dixLookupClient(ClientPtr *result,
+                    XID id,
+                    ClientPtr client,
+                    Mask access_mode);
+
 #endif /* _XSERVER_DIX_PRIV_H */

dix/dixfonts.c

@@ -52,10 +52,14 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
+#include <stddef.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
 
+#include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
 #include "os/auth.h"
 
@@ -69,7 +73,6 @@ Equipment Corporation.
 #include "closestr.h"
 #include "dixfont.h"
 #include "xace.h"
-#include <X11/fonts/libxfont2.h>
 
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"

dix/events.c

@@ -106,12 +106,13 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "misc.h"
 #include "resource.h"
-#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "inpututils.h"

dix/property.c

@@ -50,6 +50,9 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"

dix/selection.c

@@ -48,6 +48,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "dispatch.h"