frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename SaveSetMap() to SaveSetShouldMap(). 

Avoids preprocessor collision with xfixeswire.h
This commit is contained in:
Adam Jackson 2008-09-23 10:22:22 -04:00
parent ca9fae0079
commit 991ed2949b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/window.c
View File

@ -3028,7 +3028,7 @@ HandleSaveSet(ClientPtr client)
{ {
#ifdef XFIXES #ifdef XFIXES
/* unmap first so that ReparentWindow doesn't remap */ /* unmap first so that ReparentWindow doesn't remap */
if (!SaveSetMap (client->saveSet[j])) if (!SaveSetShouldMap (client->saveSet[j]))
UnmapWindow(pWin, FALSE); UnmapWindow(pWin, FALSE);
#endif #endif
ReparentWindow(pWin, pParent, ReparentWindow(pWin, pParent,
@ -3039,7 +3039,7 @@ HandleSaveSet(ClientPtr client)
pWin->mapped = FALSE; pWin->mapped = FALSE;
} }
#ifdef XFIXES #ifdef XFIXES
if (SaveSetMap (client->saveSet[j])) if (SaveSetShouldMap (client->saveSet[j]))
#endif #endif
MapWindow(pWin, client); MapWindow(pWin, client);
} }

4
include/dixstruct.h
View File

@ -75,7 +75,7 @@ typedef struct _saveSet {
} SaveSetElt; } SaveSetElt;
#define SaveSetWindow(ss) ((ss).windowPtr) #define SaveSetWindow(ss) ((ss).windowPtr)
#define SaveSetToRoot(ss) ((ss).toRoot) #define SaveSetToRoot(ss) ((ss).toRoot)
#define SaveSetMap(ss) ((ss).map) #define SaveSetShouldMap(ss) ((ss).map)
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w)) #define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr)) #define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
#define SaveSetAssignMap(ss,m) ((ss).map = (m)) #define SaveSetAssignMap(ss,m) ((ss).map = (m))
@ -83,7 +83,7 @@ typedef struct _saveSet {
typedef struct _Window *SaveSetElt; typedef struct _Window *SaveSetElt;
#define SaveSetWindow(ss) (ss) #define SaveSetWindow(ss) (ss)
#define SaveSetToRoot(ss) FALSE #define SaveSetToRoot(ss) FALSE
#define SaveSetMap(ss) TRUE #define SaveSetShouldMap(ss) TRUE
#define SaveSetAssignWindow(ss,w) ((ss) = (w)) #define SaveSetAssignWindow(ss,w) ((ss) = (w))
#define SaveSetAssignToRoot(ss,tr) #define SaveSetAssignToRoot(ss,tr)
#define SaveSetAssignMap(ss,m) #define SaveSetAssignMap(ss,m)