Skip to content

Commit c5a6d3c

Browse files
committed
[PR #1387] dix: unexport DontPropagateMask and wDontPropagateMask() macro
PR: #1387
1 parent 40bd84f commit c5a6d3c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

dix/window_priv.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#include "include/dix.h"
1111
#include "include/window.h"
1212

13+
extern Mask DontPropagateMasks[];
14+
15+
#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
16+
1317
/*
1418
* @brief create a window
1519
*

include/windowstr.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ typedef struct _Window {
169169
* fields (or filling the appropriate default value)
170170
*/
171171

172-
extern _X_EXPORT Mask DontPropagateMasks[];
173-
174172
#define wTrackParent(w,field) ((w)->optional ? \
175173
(w)->optional->field \
176174
: FindWindowWithOptional(w)->optional->field)
@@ -181,7 +179,6 @@ extern _X_EXPORT Mask DontPropagateMasks[];
181179
#define wVisual(w) wTrackParent(w, visual)
182180
#define wCursor(w) ((w)->cursorIsNone ? None : wTrackParent(w, cursor))
183181
#define wColormap(w) ((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
184-
#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
185182
#define wOtherEventMasks(w) wUseDefault(w, otherEventMasks, 0)
186183
#define wOtherClients(w) wUseDefault(w, otherClients, NULL)
187184
#define wOtherInputMasks(w) wUseDefault(w, inputMasks, NULL)

0 commit comments

Comments
 (0)