From 41a55b1e2afcf5885008e9938a7b3b1b50e515c0 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: move private definitions out of dri.h"

This reverts commit cf039485723608f0b9385bb35461a038f28b755e.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
---
 hw/xfree86/dri/dri.c      |  2 +-
 hw/xfree86/dri/dri.h      |  2 ++
 hw/xfree86/dri/dri_priv.h | 12 ------------
 hw/xfree86/dri/xf86dri.c  |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 hw/xfree86/dri/dri_priv.h

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 2f584a654..e9c5a24bb 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -64,7 +64,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/dri/xf86driproto.h>
 #include "swaprep.h"
 #include "xf86str.h"
-#include "dri_priv.h"
+#include "dri.h"
 #include "sarea.h"
 #include "dristruct.h"
 #include "mi.h"
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 6ca55405d..6e09048f4 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -195,6 +195,8 @@ extern _X_EXPORT Bool DRIScreenInit(ScreenPtr pScreen,
 
 extern _X_EXPORT void DRICloseScreen(ScreenPtr pScreen);
 
+extern Bool DRIExtensionInit(void);
+
 extern _X_EXPORT void DRIReset(void);
 
 extern _X_EXPORT Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
diff --git a/hw/xfree86/dri/dri_priv.h b/hw/xfree86/dri/dri_priv.h
deleted file mode 100644
index e0864c87a..000000000
--- a/hw/xfree86/dri/dri_priv.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef _XSERVER_DRI_PRIV_H
-#define _XSERVER_DRI_PRIV_H
-
-#include "dri.h"
-
-extern Bool DRIExtensionInit(void);
-
-#endif /* _XSERVER_DRI_PRIV_H */
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 709420564..0efaab2b2 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -57,7 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/dri/xf86driproto.h>
 #include "swaprep.h"
 #include "xf86str.h"
-#include "dri_priv.h"
+#include "dri.h"
 #include "sarea.h"
 #include "dristruct.h"
 #include "xf86drm.h"