From ac5e95be49ab34119b21264be35b9c9a3eab2861 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 9 Feb 2024 17:48:18 +0100
Subject: [PATCH] xfree86: modes: move private definitions out of from
 xf86RandR12.h

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1290>
---
 hw/xfree86/common/xf86cmap.c        |  2 +-
 hw/xfree86/modes/xf86RandR12.c      |  2 +-
 hw/xfree86/modes/xf86RandR12.h      |  5 -----
 hw/xfree86/modes/xf86RandR12_priv.h | 18 ++++++++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 hw/xfree86/modes/xf86RandR12_priv.h

diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 84f6a495d..6d5f9ac90 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -47,7 +47,7 @@
 #include "xf86_OSproc.h"
 #include "xf86str.h"
 #include "micmap.h"
-#include "xf86RandR12.h"
+#include "xf86RandR12_priv.h"
 #include "xf86Crtc.h"
 
 #ifdef XFreeXDGA
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 2279bf448..ddcf5e748 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -42,7 +42,7 @@
 
 #include "xf86cmap.h"
 #include "xf86Crtc.h"
-#include "xf86RandR12.h"
+#include "xf86RandR12_priv.h"
 
 typedef struct _xf86RandR12Info {
     int virtualX;
diff --git a/hw/xfree86/modes/xf86RandR12.h b/hw/xfree86/modes/xf86RandR12.h
index 31aaaaf28..e603799be 100644
--- a/hw/xfree86/modes/xf86RandR12.h
+++ b/hw/xfree86/modes/xf86RandR12.h
@@ -40,9 +40,4 @@ extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn,
 extern _X_EXPORT Bool xf86RandR12PreInit(ScrnInfoPtr pScrn);
 extern _X_EXPORT void xf86RandR12TellChanged(ScreenPtr pScreen);
 
-extern void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
-                                   int *indices, LOCO *colors,
-                                   VisualPtr pVisual);
-extern Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
-
 #endif                          /* _XF86_RANDR_H_ */
diff --git a/hw/xfree86/modes/xf86RandR12_priv.h b/hw/xfree86/modes/xf86RandR12_priv.h
new file mode 100644
index 000000000..a3fbab1f6
--- /dev/null
+++ b/hw/xfree86/modes/xf86RandR12_priv.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XF86RANDR12_PRIV_H_
+#define _XSERVER_XF86RANDR12_PRIV_H_
+
+#include <X11/extensions/render.h>
+
+#include "randrstr.h"
+#include "xf86RandR12.h"
+
+void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
+                            int *indices, LOCO *colors,
+                            VisualPtr pVisual);
+Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
+
+#endif /* _XSERVER_XF86RANDR12_PRIV_H_ */