From cf039485723608f0b9385bb35461a038f28b755e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 13 Feb 2024 10:43:52 +0100
Subject: [PATCH] xfree86: move private definitions out of dri.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/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, 14 insertions(+), 4 deletions(-)
 create mode 100644 hw/xfree86/dri/dri_priv.h

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index e9c5a24bb..2f584a654 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.h"
+#include "dri_priv.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 6e09048f4..6ca55405d 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -195,8 +195,6 @@ 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
new file mode 100644
index 000000000..e0864c87a
--- /dev/null
+++ b/hw/xfree86/dri/dri_priv.h
@@ -0,0 +1,12 @@
+/* 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 ba7bbd6e9..bf8b356ca 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.h"
+#include "dri_priv.h"
 #include "sarea.h"
 #include "dristruct.h"
 #include "xf86drm.h"