From 1295fc3ff575fc732be5370e011b136c1d64c080 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 17:33:37 +0200
Subject: [PATCH] dri3: unexport VERIFY_DRI3_SYNCOBJ() macro

Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dri3/dri3.h               | 14 --------------
 dri3/dri3_priv.h          | 10 ++++++++++
 present/present_request.c |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/dri3/dri3.h b/dri3/dri3.h
index b292a8694..5d2d8dda0 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -23,8 +23,6 @@
 #ifndef _DRI3_H_
 #define _DRI3_H_
 
-#ifdef DRI3
-
 #include <X11/extensions/dri3proto.h>
 #include <randrstr.h>
 
@@ -46,16 +44,6 @@ struct dri3_syncobj
     void (*signaled_eventfd)(struct dri3_syncobj *syncobj, uint64_t point, int efd);
 };
 
-#define VERIFY_DRI3_SYNCOBJ(id, ptr, a)\
-    do {\
-        int rc = dixLookupResourceByType((void **)&(ptr), id,\
-                                         dri3_syncobj_type, client, a);\
-        if (rc != Success) {\
-            client->errorValue = id;\
-            return rc;\
-        }\
-    } while (0);
-
 typedef int (*dri3_open_proc)(ScreenPtr screen,
                               RRProviderPtr provider,
                               int *fd);
@@ -146,6 +134,4 @@ dri3_send_open_reply(ClientPtr client, int fd);
 extern _X_EXPORT uint32_t
 drm_format_for_depth(uint32_t depth, uint32_t bpp);
 
-#endif
-
 #endif /* _DRI3_H_ */
diff --git a/dri3/dri3_priv.h b/dri3/dri3_priv.h
index 1fc334ca1..801ad0660 100644
--- a/dri3/dri3_priv.h
+++ b/dri3/dri3_priv.h
@@ -64,6 +64,16 @@ typedef struct dri3_screen_priv {
     real->mem = priv->mem; \
 }
 
+#define VERIFY_DRI3_SYNCOBJ(id, ptr, a)\
+    do {\
+        int rc = dixLookupResourceByType((void **)&(ptr), id,\
+                                         dri3_syncobj_type, client, a);\
+        if (rc != Success) {\
+            client->errorValue = id;\
+            return rc;\
+        }\
+    } while (0);
+
 static inline dri3_screen_priv_ptr
 dri3_screen_priv(ScreenPtr screen)
 {
diff --git a/present/present_request.c b/present/present_request.c
index 02f8846c8..49cffbfdd 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -22,6 +22,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "dri3/dri3_priv.h"
 
 #include "present_priv.h"
 #include "randrstr_priv.h"