From 631dc9d2754675d155af5aa70a1e72e912ab1cdf Mon Sep 17 00:00:00 2001
From: stefan11111 <stefan11111@shitposting.expert>
Date: Sat, 1 Nov 2025 22:13:25 +0200
Subject: [PATCH] dix: partially revert
 https://github.com/X11Libre/xserver/commit/8399c4e263a94a8cab72acae946b57d5421acc80

Turns out that glx does need this one.

Assuming no external modules need this,
it should be fine to keep this in a private header.

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
---
 dix/callback_priv.h | 14 ++++++++++++++
 dix/dixutils.c      | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dix/callback_priv.h b/dix/callback_priv.h
index 284731cf70..f2042c5d55 100644
--- a/dix/callback_priv.h
+++ b/dix/callback_priv.h
@@ -10,6 +10,20 @@
 void InitCallbackManager(void);
 void DeleteCallbackManager(void);
 
+typedef struct _CallbackRec {
+    CallbackProcPtr proc;
+    void *data;
+    Bool deleted;
+    struct _CallbackRec *next;
+} CallbackRec, *CallbackPtr;
+
+typedef struct _CallbackList {
+    int inCallback;
+    Bool deleted;
+    int numDeleted;
+    CallbackPtr list;
+} CallbackListRec;
+
 /*
  * @brief delete a callback list
  *
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 901ba78ea0..b1e0c4cfe2 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -652,20 +652,6 @@ ClientIsAsleep(ClientPtr client)
 
 /* ===== Private Procedures ===== */
 
-typedef struct _CallbackRec {
-    CallbackProcPtr proc;
-    void *data;
-    Bool deleted;
-    struct _CallbackRec *next;
-} CallbackRec, *CallbackPtr;
-
-typedef struct _CallbackList {
-    int inCallback;
-    Bool deleted;
-    int numDeleted;
-    CallbackPtr list;
-} CallbackListRec;
-
 static size_t numCallbackListsToCleanup = 0;
 static CallbackListPtr **listsToCleanup = NULL;