summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-09-23 10:22:22 -0400
committerAdam Jackson <ajax@redhat.com>2008-09-23 10:22:22 -0400
commit991ed2949ba682684952fe323f8f0f51ebdca98e (patch)
tree2c2e8fa9adaa87e014db79c86b89784082a9fbf7 /include
parentca9fae00795a114bca4397c32b543d6326a4c547 (diff)
Rename SaveSetMap() to SaveSetShouldMap().
Avoids preprocessor collision with xfixeswire.h
Diffstat (limited to 'include')
-rw-r--r--include/dixstruct.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 4877cb017..4bfe3713c 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -75,7 +75,7 @@ typedef struct _saveSet {
} SaveSetElt;
#define SaveSetWindow(ss) ((ss).windowPtr)
#define SaveSetToRoot(ss) ((ss).toRoot)
-#define SaveSetMap(ss) ((ss).map)
+#define SaveSetShouldMap(ss) ((ss).map)
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
#define SaveSetAssignMap(ss,m) ((ss).map = (m))
@@ -83,7 +83,7 @@ typedef struct _saveSet {
typedef struct _Window *SaveSetElt;
#define SaveSetWindow(ss) (ss)
#define SaveSetToRoot(ss) FALSE
-#define SaveSetMap(ss) TRUE
+#define SaveSetShouldMap(ss) TRUE
#define SaveSetAssignWindow(ss,w) ((ss) = (w))
#define SaveSetAssignToRoot(ss,tr)
#define SaveSetAssignMap(ss,m)