summaryrefslogtreecommitdiff
path: root/include/dixstruct.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2008-09-22 12:42:41 -0700
committerKeith Packard <keithp@keithp.com>2008-09-22 12:43:30 -0700
commitca9fae00795a114bca4397c32b543d6326a4c547 (patch)
tree5467c53cb04fb3e574d188171553ca7be700b526 /include/dixstruct.h
parentad14239a358cf65e5702ec7d054aa1db4f1cdd68 (diff)
Change 'remap' to 'map' in saveset functions/macros
Now that the code has been fixed so that Unmap means unmap and not "don't remap", 'remap' was confusing to have in the function names/parameters, so change it to simple 'map'. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include/dixstruct.h')
-rw-r--r--include/dixstruct.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h
index aae2dbd77..4877cb017 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -71,22 +71,22 @@ typedef enum {ClientStateInitial,
typedef struct _saveSet {
struct _Window *windowPtr;
Bool toRoot;
- Bool remap;
+ Bool map;
} SaveSetElt;
#define SaveSetWindow(ss) ((ss).windowPtr)
#define SaveSetToRoot(ss) ((ss).toRoot)
-#define SaveSetRemap(ss) ((ss).remap)
+#define SaveSetMap(ss) ((ss).map)
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
-#define SaveSetAssignRemap(ss,rm) ((ss).remap = (rm))
+#define SaveSetAssignMap(ss,m) ((ss).map = (m))
#else
typedef struct _Window *SaveSetElt;
#define SaveSetWindow(ss) (ss)
#define SaveSetToRoot(ss) FALSE
-#define SaveSetRemap(ss) TRUE
+#define SaveSetMap(ss) TRUE
#define SaveSetAssignWindow(ss,w) ((ss) = (w))
#define SaveSetAssignToRoot(ss,tr)
-#define SaveSetAssignRemap(ss,rm)
+#define SaveSetAssignMap(ss,m)
#endif
typedef struct _Client {