From 4d0b5833da43542dce109ba3a6e8301f8e04f9c6 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 30 Apr 2024 14:22:27 +0200
Subject: [PATCH] xv: move SCREEN_(PROLOGUE|EPILOGUE) into xvmain.c

These macros are only used in xvmain.c, so no need to keep
them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
---
 Xext/xvdix.h  | 6 ------
 Xext/xvmain.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index bfd1c1aa3..ee09b3dde 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -212,12 +212,6 @@ typedef struct {
     CloseScreenProcPtr CloseScreen;
 } XvScreenRec, *XvScreenPtr;
 
-#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
-
-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
-    ((pScreen)->field = wrapper)
-
 /* Errors */
 
 #define _XvBadPort (XvBadPort+XvErrorBase)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 6c254fdd0..22baec49f 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -104,6 +104,12 @@ SOFTWARE.
 #endif
 #include "xvdisp.h"
 
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
+
+#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
+    ((pScreen)->field = wrapper)
+
 static DevPrivateKeyRec XvScreenKeyRec;
 
 Bool noXvExtension = FALSE;