Skip to content

Commit 631dc9d

Browse files
stefan11111metux
authored andcommitted
dix: partially revert 8399c4e
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 <[email protected]>
1 parent ec3232e commit 631dc9d

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

dix/callback_priv.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@
1010
void InitCallbackManager(void);
1111
void DeleteCallbackManager(void);
1212

13+
typedef struct _CallbackRec {
14+
CallbackProcPtr proc;
15+
void *data;
16+
Bool deleted;
17+
struct _CallbackRec *next;
18+
} CallbackRec, *CallbackPtr;
19+
20+
typedef struct _CallbackList {
21+
int inCallback;
22+
Bool deleted;
23+
int numDeleted;
24+
CallbackPtr list;
25+
} CallbackListRec;
26+
1327
/*
1428
* @brief delete a callback list
1529
*

dix/dixutils.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -652,20 +652,6 @@ ClientIsAsleep(ClientPtr client)
652652

653653
/* ===== Private Procedures ===== */
654654

655-
typedef struct _CallbackRec {
656-
CallbackProcPtr proc;
657-
void *data;
658-
Bool deleted;
659-
struct _CallbackRec *next;
660-
} CallbackRec, *CallbackPtr;
661-
662-
typedef struct _CallbackList {
663-
int inCallback;
664-
Bool deleted;
665-
int numDeleted;
666-
CallbackPtr list;
667-
} CallbackListRec;
668-
669655
static size_t numCallbackListsToCleanup = 0;
670656
static CallbackListPtr **listsToCleanup = NULL;
671657

0 commit comments

Comments
 (0)