From d13ba4a9e5d8d692262a42c49a5a12008c271d03 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 17 Jun 2025 14:36:09 -0700
Subject: [PATCH] Revert "xfree86: modes: move private definitions out of from
 xf86RandR12.h"

This reverts commit ac5e95be49ab34119b21264be35b9c9a3eab2861.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
---
 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, 7 insertions(+), 20 deletions(-)
 delete mode 100644 hw/xfree86/modes/xf86RandR12_priv.h

diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 6d5f9ac90..84f6a495d 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_priv.h"
+#include "xf86RandR12.h"
 #include "xf86Crtc.h"
 
 #ifdef XFreeXDGA
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index bf33da377..cdc4d0c7f 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_priv.h"
+#include "xf86RandR12.h"
 
 typedef struct _xf86RandR12Info {
     int virtualX;
diff --git a/hw/xfree86/modes/xf86RandR12.h b/hw/xfree86/modes/xf86RandR12.h
index e603799be..31aaaaf28 100644
--- a/hw/xfree86/modes/xf86RandR12.h
+++ b/hw/xfree86/modes/xf86RandR12.h
@@ -40,4 +40,9 @@ 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
deleted file mode 100644
index a3fbab1f6..000000000
--- a/hw/xfree86/modes/xf86RandR12_priv.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 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_ */