Revert "xfree86: move private definitions out of dri2.h"

This reverts commit 1d3c26446d.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>

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"

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);

hw/xfree86/dri2/dri2_priv.h

@@ -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_ */

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"