From 781a12fb8d5c54935cdf7a7f460f5711406ad1f4 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 dri2.h"

This reverts commit 1d3c26446d0fc283c9bedfab29d1652fbff4a10e.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
---
 hw/xfree86/dri2/dri2.c      |  2 +-
 hw/xfree86/dri2/dri2.h      |  3 +++
 hw/xfree86/dri2/dri2_priv.h | 13 -------------
 hw/xfree86/dri2/dri2ext.c   |  2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 hw/xfree86/dri2/dri2_priv.h

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 8158a1661..953e736e4 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -45,7 +45,7 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "dixstruct.h"
-#include "dri2_priv.h"
+#include "dri2.h"
 #include "dri2int.h"
 #include "damage.h"
 #include "xf86.h"
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
index c17a3a27c..4c14b705d 100644
--- a/hw/xfree86/dri2/dri2.h
+++ b/hw/xfree86/dri2/dri2.h
@@ -46,6 +46,9 @@ typedef struct {
     void *driverPrivate;
 } DRI2BufferRec, *DRI2BufferPtr;
 
+extern CARD8 dri2_major;        /* version of DRI2 supported by DDX */
+extern CARD8 dri2_minor;
+
 typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr;
 typedef void (*DRI2SwapEventPtr) (ClientPtr client, void *data, int type,
                                   CARD64 ust, CARD64 msc, CARD32 sbc);
diff --git a/hw/xfree86/dri2/dri2_priv.h b/hw/xfree86/dri2/dri2_priv.h
deleted file mode 100644
index f54aaa163..000000000
--- a/hw/xfree86/dri2/dri2_priv.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef _XSERVER_DRI2_PRIV_H_
-#define _XSERVER_DRI2_PRIV_H_
-
-#include "dri2.h"
-
-extern CARD8 dri2_major;        /* version of DRI2 supported by DDX */
-extern CARD8 dri2_minor;
-
-#endif /* _XSERVER_DRI2_PRIV_H_ */
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index a683bb818..b1d604a9e 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -46,7 +46,7 @@
 #include "pixmapstr.h"
 #include "extnsionst.h"
 #include "xfixes.h"
-#include "dri2_priv.h"
+#include "dri2.h"
 #include "dri2int.h"
 #include "protocol-versions.h"